X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=95166157ede800f0755df3448ea6fb3577292218;hb=16d9e30dd7fa052bd7e6dd37927d7f27bec90ef1;hp=c71d6edde8cee3328d1cafcf08dc35f09dda3dd8;hpb=5d047523c87ba11aad8c384f7ffde25b4dd746ed;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index c71d6ed..9516615 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -19,13 +19,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
-# Import stuff from 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")'
 
@@ -34,26 +27,32 @@ avahiincludedir=$(includedir)/avahi-core
 avahiinclude_HEADERS = \
 	core.h \
 	log.h \
-	rr.h
+	rr.h \
+	publish.h \
+	lookup.h
 
 lib_LTLIBRARIES = \
 	libavahi-core.la 
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
 	prioq-test \
 	avahi-test \
 	conformance-test \
 	avahi-reflector \
 	dns-test \
-	timeeventq-test
+	timeeventq-test \
+	hashmap-test \
+	querier-test \
+	update-test
+endif  
 
 libavahi_core_la_SOURCES = \
 	timeeventq.c timeeventq.h\
 	iface.c iface.h \
-	netlink.c netlink.h \
-	server.c server.h \
+	server.c internal.h entry.c \
 	prioq.c prioq.h \
-	cache.c cache.h\
+	cache.c cache.h \
 	socket.c socket.h \
 	response-sched.c response-sched.h \
 	query-sched.c query-sched.h \
@@ -69,51 +68,86 @@ libavahi_core_la_SOURCES = \
 	resolve-service.c \
 	dns.c dns.h \
 	rr.c rr.h \
-	core.h \
+	core.h lookup.h publish.h \
 	log.c log.h \
 	browse-dns-server.c \
 	fdutil.h fdutil.c \
-	util.c util.h
+	util.c util.h \
+	hashmap.c hashmap.h \
+	wide-area.c wide-area.h \
+	multicast-lookup.c multicast-lookup.h \
+	querier.c querier.h
+
+if HAVE_NETLINK
+libavahi_core_la_SOURCES += \
+       iface-linux.c iface-linux.h \
+       netlink.c netlink.h
+else
+if HAVE_PF_ROUTE 
+libavahi_core_la_SOURCES += \
+	iface-pfroute.c iface-pfroute.h
+endif
+endif
 
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
-libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
+libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CORE_VERSION_INFO)
 
 prioq_test_SOURCES = \
 	prioq-test.c  \
 	prioq.c prioq.h
 prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+prioq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 avahi_test_SOURCES = \
 	avahi-test.c
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+avahi_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
+
+update_test_SOURCES = \
+	update-test.c
+update_test_CFLAGS = $(AM_CFLAGS)
+update_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
+
+querier_test_SOURCES = \
+	querier-test.c
+querier_test_CFLAGS = $(AM_CFLAGS)
+querier_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 conformance_test_SOURCES = \
 	conformance-test.c
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+conformance_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 avahi_reflector_SOURCES = \
 	avahi-reflector.c
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+avahi_reflector_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 dns_test_SOURCES = \
 	dns.c dns.h \
 	dns-test.c \
 	log.c log.h \
 	util.c util.h \
-	rr.c rr.h
+	rr.c rr.h \
+	hashmap.c hashmap.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 timeeventq_test_SOURCES = \
 	timeeventq-test.c \
 	timeeventq.h timeeventq.c \
-	prioq.h prioq.c
+	prioq.h prioq.c \
+	log.c log.h
 timeeventq_test_CFLAGS = $(AM_CFLAGS)
-timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+timeeventq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+
+hashmap_test_SOURCES = \
+	hashmap-test.c \
+	hashmap.h hashmap.c \
+	util.h util.c
+hashmap_test_CFLAGS = $(AM_CFLAGS)
+hashmap_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 valgrind: avahi-test
 	libtool --mode=execute valgrind ./avahi-test