X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=7abc497dc120784b92e28da7b6b3f6ac6fe5f00d;hb=38b45921cd1d33119f1c06979a57bcfe982e22da;hp=6920e8c6627c7e9795481e0d6ce317f6014d67dc;hpb=e877dd63989740389135513745c92b253fefd3fe;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 6920e8c..7abc497 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -17,7 +17,7 @@
 # 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)
@@ -25,14 +25,15 @@ AM_LDADD=$(GLIB20_LIBS)
 
 # Import stuff from avahi-common
 AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
-AM_LDADD+=../avahi-common/libavahi-common.la
+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 =
+avahiinclude_HEADERS = \
 	core.h
 
 lib_LTLIBRARIES = \
@@ -43,7 +44,8 @@ noinst_PROGRAMS = \
 	avahi-test \
 	conformance-test \
 	avahi-reflector \
-	dns-test
+	dns-test \
+	timeeventq-test
 
 libavahi_core_la_SOURCES = \
 	timeeventq.c timeeventq.h\
@@ -65,37 +67,51 @@ libavahi_core_la_SOURCES = \
 	browse-service-type.c \
 	browse-service.c \
 	resolve-service.c \
-	dns.c dns.h
+	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
+	dns-test.c \
+	log.c log.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
+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