X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=2a2d134bc79a5a5ecfddd0ca985e49e4bdca5313;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=b692fcce33d0d0c0a87334bb81a015c4619529b8;hpb=c5544522f6409095627dc3d1129560195ab4ec40;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index b692fcc..2a2d134 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -17,21 +17,25 @@
 # 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) ../avahi-common/libavahi-common.la
+AM_LDADD=$(GLIB20_LIBS)
 
-AM_CFLAGS+=-I$(top_srcdir)/avahi-common
+# Import stuff from avahi-common
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
+COMMON_LDADD=../avahi-common/libavahi-common.la
+STATIC_COMMON_LDADD=../avahi-common/libavahi-common-static.a
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahiincludedir=$(includedir)/avahi-core 
+avahiincludedir=$(includedir)/avahi-core
 
-avahiinclude_HEADERS =
-	core.h
+avahiinclude_HEADERS = \
+	core.h \
+	log.h
 
 lib_LTLIBRARIES = \
 	libavahi-core.la 
@@ -40,7 +44,9 @@ noinst_PROGRAMS = \
 	prioq-test \
 	avahi-test \
 	conformance-test \
-	avahi-reflector
+	avahi-reflector \
+	dns-test \
+	timeeventq-test
 
 libavahi_core_la_SOURCES = \
 	timeeventq.c timeeventq.h\
@@ -61,31 +67,52 @@ libavahi_core_la_SOURCES = \
 	browse-domain.c \
 	browse-service-type.c \
 	browse-service.c \
-	resolve-service.c
+	resolve-service.c \
+	dns.c dns.h \
+	core.h \
+	llist.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)
+prioq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 avahi_test_SOURCES = \
 	avahi-test.c \
 	$(libavahi_core_la_SOURCES)
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD)
+avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 conformance_test_SOURCES = \
 	conformance-test.c \
 	$(libavahi_core_la_SOURCES)
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD)
+conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 avahi_reflector_SOURCES = \
 	avahi-reflector.c \
 	$(libavahi_core_la_SOURCES)
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD)
+avahi_reflector_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+
+dns_test_SOURCES = \
+	dns.c dns.h \
+	dns-test.c \
+	log.c log.h
+dns_test_CFLAGS = $(AM_CFLAGS)
+dns_test_LDADD = $(AM_LDADD) $(STATIC_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) $(STATIC_COMMON_LDADD)
 
 valgrind: avahi-test
 	libtool --mode=execute valgrind ./avahi-test