X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=ee33c8e82a7c0b220f3978fc39b5b0b14ca9dbd5;hb=f1167112d926b189fe189599576e8588923f036c;hp=6788f311de3823b4ef173b22e5b48d3f94abb186;hpb=beb3eff6ff01d12230e7b21d147392854a07c634;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 6788f31..ee33c8e 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,92 @@ avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	rr.h \
-	util.h \
+	domain.h \
 	cdecl.h \
-	defs.h
-
-if ENABLE_DBUS
-avahi_commoninclude_HEADERS += dbus.h
-endif
+	defs.h \
+	malloc.h
+	watch.h \
+	timeval.h \
+	simple-watch.h \
+	gccmacro.h
 
-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
+	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)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
 
 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)
 
 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 HAVE_DBUS
+
+noinst_HEADERS += \
+	dbus.h \
+	dbus-watch-glue.h
+
+noinst_LTLIBRARIES = \
+	libdbus-watch-glue.la \
+	libdbus-watch-glue-pic.la
+
+libdbus_watch_glue_la_SOURCES = \
+	dbus-watch-glue.h dbus-watch-glue.c
+libdbus_watch_glue_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_watch_glue_la_LDFLAGS = $(AM_LDFLAGS) -all-static
+
+libdbus_watch_glue_pic_la_SOURCES = $(libdbus_watch_glue_la_SOURCES)
+libdbus_watch_glue_pic_la_CFLAGS = $(libdbus_watch_glue_la_CFLAGS) -fPIC
+libdbus_watch_glue_pic_la_LDFLAGS = $(libdbus_watch_glue_la_LDFLAGS)
+
+endif