X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=a580a9d579bd1895e0baef7c46851ca58ac3d3fc;hb=ec27d6612430992e3524901d5ac9113169822ab6;hp=3b025be41b1c8ac4e7ad902e99e6d0758bd1b738;hpb=e63a65b3955b173a3e8d6b78c6377a518a9922d6;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 3b025be..a580a9d 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,22 +28,25 @@ avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	util.h \
+	domain.h \
 	cdecl.h \
 	defs.h \
-	malloc.h
-
-if ENABLE_DBUS
-avahi_commoninclude_HEADERS += dbus.h
-endif
+	malloc.h \
+	watch.h \
+	timeval.h \
+	simple-watch.h \
+	gccmacro.h \
+	error.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 
@@ -58,36 +57,65 @@ libavahi_common_la_SOURCES = \
 	alternative.c alternative.h \
 	error.c error.h \
 	strlst.c strlst.h \
-	util.c util.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 $(LIBAVAHI_COMMON_VERSION_INFO) 1:0:1
 
 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 \
-	util.c util.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)
 
-timeval_test_SOURCES = \
-	util.c util.h \
+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)
-timeval_test_LDADD = $(AM_LDADD)
+
+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