X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=a580a9d579bd1895e0baef7c46851ca58ac3d3fc;hb=a9566d5dcac080d7fa91546823277c57a5d09a5f;hp=c9c04e8cd217333a19c4feeb23736cfc02291399;hpb=86727e2f97a5e845d462178692c8574d226f22d7;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index c9c04e8..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,7 +63,7 @@ libavahi_common_la_SOURCES = \
 	watch.h gccmacro.h
 
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO) 1:0:1
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -96,19 +97,25 @@ timeval_test_SOURCES = \
 	timeval-test.c
 timeval_test_CFLAGS = $(AM_CFLAGS)
 
-if ENABLE_DBUS
+if HAVE_DBUS
 
 noinst_HEADERS += \
 	dbus.h \
 	dbus-watch-glue.h
 
 noinst_LTLIBRARIES = \
-	libdbus-watch-glue.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) -static -export-dynamic
+	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