X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=c78e0541df6690e4d3feb217ac4c98a8510e3a3b;hb=5d047523c87ba11aad8c384f7ffde25b4dd746ed;hp=b4125d62f91804d6242fb6b23671f1c0cbf4030a;hpb=368ed1a2a0d95964b3f88c70c9a8c5516367f3f7;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index b4125d6..c78e054 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -19,10 +19,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -32,57 +28,78 @@ avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	rr.h \
-	util.h \
+	domain.h \
 	cdecl.h \
-	dbus.h
+	defs.h \
+	malloc.h
+	watch.h \
+	timeval.h \
+	simple-watch.h
+
+noinst_HEADERS = llist.h
+
+if ENABLE_DBUS
+noinst_HEADERS += dbus.h
+endif
 
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
 	alternative-test \
-	timeval-test
+	timeval-test \
+	watch-test
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
 
-noinst_LIBRARIES = \
-	libavahi-common-static.a
-
 libavahi_common_la_SOURCES = \
+	malloc.c malloc.h \
 	address.c address.h \
-	strlst.c strlst.h \
 	alternative.c alternative.h \
-	rr.c rr.h \
-	util.c util.h
+	error.c error.h \
+	strlst.c strlst.h \
+	domain.c domain.h \
+	timeval.c timeval.h \
+	simple-watch.c simple-watch.h \
+	watch.h
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LIBADD = $(AM_LDADD)
 
-libavahi_common_static_a_SOURCES = $(libavahi_common_la_SOURCES)
-libavahi_common_static_a_CFLAGS = $(AM_CFLAGS)
-libavahi_common_static_a_LIBADD =
-
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
-        strlst-test.c
+	malloc.c malloc.h \
+	strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
 strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
-        alternative-test.c
+	malloc.c malloc.h \
+	domain.c domain.h \
+	alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
 alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
-	util.c util.h \
+	domain.c domain.h \
+	malloc.c malloc.h \
 	domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
 domain_test_LDADD = $(AM_LDADD)
 
+watch_test_SOURCES = \
+	timeval.c timeval.h \
+	simple-watch.c simple-watch.h \
+	watch.h \
+	malloc.c malloc.h \
+	watch-test.c
+watch_test_CFLAGS = $(AM_CFLAGS)
+watch_test_LDADD = $(AM_LDADD)
+
 timeval_test_SOURCES = \
-	util.c util.h \
+	timeval.c timeval.h \
 	timeval-test.c
 timeval_test_CFLAGS = $(AM_CFLAGS)
 timeval_test_LDADD = $(AM_LDADD)
 
+