X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=5556ff4cfd245be2c009d2de3599aef5682c56c5;hb=1ff162d58059b9552c2b5594779eff9e0f215482;hp=d91343b317eb798798c7c9df8ebdfdd7acb4b8c0;hpb=33f474169daae72b9aa4c5ede260663207b2e4a3;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index d91343b..5556ff4 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")'
 
@@ -35,19 +31,22 @@ avahi_commoninclude_HEADERS = \
 	domain.h \
 	cdecl.h \
 	defs.h \
-	malloc.h
-
-noinst_HEADERS = llist.h
-
-if ENABLE_DBUS
-noinst_HEADERS += dbus.h
-endif
+	malloc.h \
+	watch.h \
+	timeval.h \
+	simple-watch.h \
+	gccmacro.h \
+	error.h
 
+noinst_HEADERS = \
+	llist.h
 
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
-	alternative-test
+	alternative-test \
+	timeval-test \
+	watch-test
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
@@ -58,16 +57,19 @@ libavahi_common_la_SOURCES = \
 	alternative.c alternative.h \
 	error.c error.h \
 	strlst.c strlst.h \
-	domain.c domain.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 \
@@ -75,12 +77,45 @@ alternative_test_SOURCES = \
 	domain.c domain.h \
 	alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
 	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 = \
+	timeval.c timeval.h \
+	timeval-test.c
+timeval_test_CFLAGS = $(AM_CFLAGS)
+
+if HAVE_DBUS
+
+noinst_HEADERS += \
+	dbus.h \
+	dbus-watch-glue.h
+
+noinst_LTLIBRARIES = \
+	libdbus-common.la \
+	libdbus-common-pic.la
+
+libdbus_common_la_SOURCES = \
+	dbus-watch-glue.h dbus-watch-glue.c \
+	dbus.h dbus.c
+libdbus_common_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_common_la_LDFLAGS = $(AM_LDFLAGS) -all-static
+
+libdbus_common_pic_la_SOURCES = $(libdbus_common_la_SOURCES)
+libdbus_common_pic_la_CFLAGS = $(libdbus_common_la_CFLAGS) -fPIC
+libdbus_common_pic_la_LDFLAGS = $(libdbus_common_la_LDFLAGS)
+
+endif