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

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 4310797..a580a9d 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -31,11 +31,12 @@ 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
@@ -62,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 $(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 \
@@ -77,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 \
@@ -93,28 +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
 
-
-if ENABLE_DBUS
 noinst_HEADERS += \
 	dbus.h \
 	dbus-watch-glue.h
 
-noinst_LIBRARIES = \
-	libdbus-watch-glue.a
+noinst_LTLIBRARIES = \
+	libdbus-common.la \
+	libdbus-common-pic.la
 
-libdbus_watch_glue_a_SOURCES = \
-	dbus-watch-glue.h dbus-watch-glue.c
+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_watch_glue_a_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+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