X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=4310797f85f42e3e2228693dc91de11b3eb2403b;hb=fe367caf27dd022258218a768da1ae2ddd246203;hp=d7c15e81c1b476c0542eb5f604876bd2993aa273;hpb=78e5c32efe567a123e94310f75896d5590d91ec9;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index d7c15e8..4310797 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,56 +28,93 @@ avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	rr.h \
-	util.h \
+	domain.h \
 	cdecl.h \
-	defs.h
+	defs.h \
+	malloc.h
+	watch.h \
+	timeval.h \
+	simple-watch.h \
+	gccmacro.h
 
-if ENABLE_DBUS
-avahi_commoninclude_HEADERS += dbus.h
-endif
-
-noinst_HEADERS = llist.h
+noinst_HEADERS = \
+	llist.h
 
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
 	alternative-test \
-	timeval-test
+	timeval-test \
+	watch-test
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
 
 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 gccmacro.h
+
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LIBADD = $(AM_LDADD)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
+	malloc.c malloc.h \
 	strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
 strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
+	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)
 
+
+
+if ENABLE_DBUS
+noinst_HEADERS += \
+	dbus.h \
+	dbus-watch-glue.h
+
+noinst_LIBRARIES = \
+	libdbus-watch-glue.a
+
+libdbus_watch_glue_a_SOURCES = \
+	dbus-watch-glue.h dbus-watch-glue.c
+
+libdbus_watch_glue_a_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
+endif
+