X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=2e436a68e00676ce7a5476241b9cc99d3099f098;hb=626fc201ecd2bce291e051e7ee1aa577f11afc26;hp=afc958cabc798b33e2d04368f8b2dc0bf9165edb;hpb=e1f934bbe96fd8e7f3f5212b783c0d3a434d4789;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index afc958c..2e436a6 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -17,114 +17,100 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
+AM_CFLAGS=-I$(top_srcdir)
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
 AM_LDADD=$(GLIB20_LIBS)
 
+# Import stuff from avahi-common
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
+COMMON_LDADD=../avahi-common/libavahi-common.la
+
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 avahiincludedir=$(includedir)/avahi-core
 
 avahiinclude_HEADERS = \
-	rr.h \
-	address.h \
-	strlst.h \
 	core.h \
-	alternative.h
+	log.h \
+	rr.h
 
 lib_LTLIBRARIES = \
 	libavahi-core.la 
 
 noinst_PROGRAMS = \
-	dns-test \
-	domain-test \
 	prioq-test \
-	strlst-test \
 	avahi-test \
-	alternative-test \
 	conformance-test \
-	avahi-reflector
+	avahi-reflector \
+	dns-test \
+	timeeventq-test
 
 libavahi_core_la_SOURCES = \
 	timeeventq.c timeeventq.h\
 	iface.c iface.h \
 	netlink.c netlink.h \
 	server.c server.h \
-	address.c address.h \
-	util.c util.h \
 	prioq.c prioq.h \
 	cache.c cache.h\
-	rr.c rr.h \
-	dns.c dns.h \
 	socket.c socket.h \
 	response-sched.c response-sched.h \
 	query-sched.c query-sched.h \
 	probe-sched.c probe-sched.h \
 	announce.c announce.h \
 	browse.c browse.h \
-	strlst.c strlst.h \
 	rrlist.c rrlist.h \
-	alternative.c alternative.h \
 	resolve-host-name.c \
 	resolve-address.c \
 	browse-domain.c \
 	browse-service-type.c \
 	browse-service.c \
-	resolve-service.c
+	resolve-service.c \
+	dns.c dns.h \
+	rr.c rr.h \
+	core.h \
+	log.c log.h \
+	browse-dns-server.c
+libavahi_core_la_CFLAGS = $(AM_CFLAGS)
+libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 
 prioq_test_SOURCES = \
 	prioq-test.c  \
 	prioq.c prioq.h
 prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD)
-
-strlst_test_SOURCES = \
-	strlst-test.c \
-	strlst.c strlst.h
-strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
-
-domain_test_SOURCES = \
-	domain-test.c \
-	util.c util.h
-domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
-
-dns_test_SOURCES = \
-	dns-test.c \
-	util.c util.h \
-	dns.c dns.h \
-	rr.c rr.h \
-	strlst.c strlst.h
-dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
+prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
 avahi_test_SOURCES = \
-	avahi-test.c \
-	$(libavahi_core_la_SOURCES)
+	avahi-test.c
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD)
-
-alternative_test_SOURCES = \
-	alternative-test.c \
-	alternative.c alternative.h
-alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
+avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 conformance_test_SOURCES = \
-	conformance-test.c \
-	$(libavahi_core_la_SOURCES)
+	conformance-test.c
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD)
+conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 avahi_reflector_SOURCES = \
-	avahi-reflector.c \
-	$(libavahi_core_la_SOURCES)
+	avahi-reflector.c
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD)
+avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+
+dns_test_SOURCES = \
+	dns.c dns.h \
+	dns-test.c \
+	log.c log.h \
+	rr.c rr.h
+dns_test_CFLAGS = $(AM_CFLAGS)
+dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+
+timeeventq_test_SOURCES = \
+	timeeventq-test.c \
+	timeeventq.h timeeventq.c \
+	prioq.h prioq.c
+timeeventq_test_CFLAGS = $(AM_CFLAGS)
+timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
 valgrind: avahi-test
 	libtool --mode=execute valgrind ./avahi-test