* cleanup build system a little

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index c9c04e8cd217333a19c4feeb23736cfc02291399..ee33c8e82a7c0b220f3978fc39b5b0b14ca9dbd5 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -96,19 +96,24 @@ 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 \
+       libdbus-watch-glue-pic.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_watch_glue_la_LDFLAGS = $(AM_LDFLAGS) -all-static
+
+libdbus_watch_glue_pic_la_SOURCES = $(libdbus_watch_glue_la_SOURCES)
+libdbus_watch_glue_pic_la_CFLAGS = $(libdbus_watch_glue_la_CFLAGS) -fPIC
+libdbus_watch_glue_pic_la_LDFLAGS = $(libdbus_watch_glue_la_LDFLAGS)
 
 endif