X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=b692fcce33d0d0c0a87334bb81a015c4619529b8;hb=64dff8088b43bd2f367f35e18bf02e73c8052dec;hp=31268e8b96b6479dd0ed30551d54d62c3402e5d4;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 31268e8..b692fcc 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -21,37 +21,47 @@ AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+AM_LDADD=$(GLIB20_LIBS) ../avahi-common/libavahi-common.la
+
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+avahiincludedir=$(includedir)/avahi-core 
+
+avahiinclude_HEADERS =
+	core.h
+
 lib_LTLIBRARIES = \
-	libavahi-core.la
+	libavahi-core.la 
 
 noinst_PROGRAMS = \
-	dns-test \
-	domain-test \
 	prioq-test \
-	strlst-test \
-	avahi-test
+	avahi-test \
+	conformance-test \
+	avahi-reflector
 
 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 \
-	psched.c psched.h \
+	response-sched.c response-sched.h \
+	query-sched.c query-sched.h \
+	probe-sched.c probe-sched.h \
 	announce.c announce.h \
-	subscribe.c subscribe.h \
-	strlst.c strlst.h
+	browse.c browse.h \
+	rrlist.c rrlist.h \
+	resolve-host-name.c \
+	resolve-address.c \
+	browse-domain.c \
+	browse-service-type.c \
+	browse-service.c \
+	resolve-service.c
 
 prioq_test_SOURCES = \
 	prioq-test.c  \
@@ -59,30 +69,26 @@ prioq_test_SOURCES = \
 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)
-
 avahi_test_SOURCES = \
-	avahi-test.c
+	avahi-test.c \
+	$(libavahi_core_la_SOURCES)
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) libavahi-core.la
+avahi_test_LDADD = $(AM_LDADD)
+
+conformance_test_SOURCES = \
+	conformance-test.c \
+	$(libavahi_core_la_SOURCES)
+conformance_test_CFLAGS = $(AM_CFLAGS)
+conformance_test_LDADD = $(AM_LDADD)
+
+avahi_reflector_SOURCES = \
+	avahi-reflector.c \
+	$(libavahi_core_la_SOURCES)
+avahi_reflector_CFLAGS = $(AM_CFLAGS)
+avahi_reflector_LDADD = $(AM_LDADD)
 
+valgrind: avahi-test
+	libtool --mode=execute valgrind ./avahi-test
 
+gdb: avahi-test
+	libtool --mode=execute gdb ./avahi-test