* Improve and reorganise DBus error handling, see avahi-common/dbus.h

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index c9c04e8cd217333a19c4feeb23736cfc02291399..1ea7ba43a6710256f26d4bb9e3a204ad803d23ce 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -22,6 +22,9 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+# Need some DBUS defines for dbus.h
+AM_CFLAGS+=$(DBUS_CFLAGS)
+
 avahi_commonincludedir=$(includedir)/avahi-common
 
 avahi_commoninclude_HEADERS = \
@@ -31,11 +34,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
@@ -59,7 +63,8 @@ libavahi_common_la_SOURCES = \
        domain.c domain.h \
        timeval.c timeval.h \
        simple-watch.c simple-watch.h \
-       watch.h gccmacro.h
+       watch.h gccmacro.h \
+       dbus.c dbus.h
 
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
@@ -96,19 +101,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