From f1167112d926b189fe189599576e8588923f036c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Aug 2005 21:31:30 +0000 Subject: * cleanup build system a little * strip remaining glib usage * -fPIC build fix for x86-64 (thanks tvainika) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@336 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-common/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'avahi-common') diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index c9c04e8..ee33c8e 100644 --- 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 -- cgit