X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=66e36d479d16602cee954b672ef664398db040f9;hb=4ddfb3cc4ac10efff11fc58693ae2aacf592fb73;hp=7c41ea32480ef98e564f6ee307c292a59de69343;hpb=9f0dd75f02f5eceb758436de07f18fcc892c12f0;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 7c41ea3..66e36d4 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -31,17 +31,15 @@ avahi_commoninclude_HEADERS = \
 	domain.h \
 	cdecl.h \
 	defs.h \
-	malloc.h
+	malloc.h \
 	watch.h \
 	timeval.h \
 	simple-watch.h \
-	gccmacro.h
+	gccmacro.h \
+	error.h
 
-noinst_HEADERS = llist.h
-
-if ENABLE_DBUS
-noinst_HEADERS += dbus.h
-endif
+noinst_HEADERS = \
+	llist.h
 
 noinst_PROGRAMS = \
 	strlst-test \
@@ -65,14 +63,13 @@ libavahi_common_la_SOURCES = \
 	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 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 \
@@ -80,14 +77,12 @@ 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 \
@@ -96,12 +91,31 @@ watch_test_SOURCES = \
 	malloc.c malloc.h \
 	watch-test.c
 watch_test_CFLAGS = $(AM_CFLAGS)
-watch_test_LDADD = $(AM_LDADD)
 
 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