X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=2f095967718e8ffa26655157a39b0dec52525ed6;hb=7b124f6ae362a575460d2374dca39ebdce07c714;hp=a3005605dfdf4ca3d3d1553a8d2681ee977e0ed6;hpb=4f0a5e7572a4257894b4bfede42c26d65152609e;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index a300560..2f09596 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -19,12 +17,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# Import stuff from avahi-common
-COMMON_LDADD=../avahi-common/libavahi-common.la
-
-# Import stuff from avahi-glib
-GLIB_LDADD=../avahi-glib/libavahi-glib.la
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -33,27 +25,38 @@ avahiincludedir=$(includedir)/avahi-core
 avahiinclude_HEADERS = \
 	core.h \
 	log.h \
-	rr.h
+	rr.h \
+	publish.h \
+	lookup.h
 
 lib_LTLIBRARIES = \
-	libavahi-core.la 
+	libavahi-core.la
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
 	prioq-test \
 	avahi-test \
 	conformance-test \
 	avahi-reflector \
 	dns-test \
+	dns-spin-test \
 	timeeventq-test \
+	hashmap-test \
+	querier-test \
+	update-test
+
+TESTS = \
+	dns-spin-test \
+	dns-test \
 	hashmap-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 \
@@ -68,37 +71,68 @@ libavahi_core_la_SOURCES = \
 	browse-service.c \
 	resolve-service.c \
 	dns.c dns.h \
-	rr.c rr.h \
-	core.h \
+	rr.c rr.h rr-util.h \
+	core.h lookup.h publish.h \
 	log.c log.h \
 	browse-dns-server.c \
 	fdutil.h fdutil.c \
 	util.c util.h \
-	hashmap.c hashmap.h
+	hashmap.c hashmap.h \
+	wide-area.c wide-area.h \
+	multicast-lookup.c multicast-lookup.h \
+	querier.c querier.h \
+	addr-util.h addr-util.c \
+	domain-util.h domain-util.c \
+	dns-srv-rr.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
+else
+libavahi_core_la_SOURCES += \
+	iface-none.c
+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)  -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) $(GLIB20_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
+avahi_test_CFLAGS = $(AM_CFLAGS)
+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) $(GLIB20_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
+conformance_test_CFLAGS = $(AM_CFLAGS)
+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 \
@@ -106,9 +140,16 @@ dns_test_SOURCES = \
 	log.c log.h \
 	util.c util.h \
 	rr.c rr.h \
-	hashmap.c hashmap.h
+	hashmap.c hashmap.h \
+	domain-util.c domain-util.h \
+	addr-util.c addr-util.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+
+dns_spin_test_SOURCES = \
+	dns-spin-test.c
+dns_spin_test_CFLAGS = $(AM_CFLAGS)
+dns_spin_test_LDADD = $(AM_LDADD) libavahi-core.la
 
 timeeventq_test_SOURCES = \
 	timeeventq-test.c \
@@ -116,14 +157,14 @@ timeeventq_test_SOURCES = \
 	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) $(COMMON_LDADD)
+hashmap_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 valgrind: avahi-test
 	libtool --mode=execute valgrind ./avahi-test