* Some minor cleanups in netlink code

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index c9c04e8cd217333a19c4feeb23736cfc02291399..972e9ad8ad44ea19915a00c0921f8a5a2a476f9e 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -31,14 +31,14 @@ avahi_commoninclude_HEADERS = \
        domain.h \
        cdecl.h \
        defs.h \
-       malloc.h
+       malloc.h \
        watch.h \
        timeval.h \
        simple-watch.h \
-       gccmacro.h
-
-noinst_HEADERS = \
-       llist.h
+       gccmacro.h \
+       error.h \
+       llist.h \
+       rlist.h
 
 noinst_PROGRAMS = \
        strlst-test \
@@ -59,10 +59,11 @@ 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 \
+       rlist.h rlist.c
 
 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)
 
 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 += \
+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