don't build static library for dbus-watch-glue and the like, instead compile the sources directly where it is needed

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1028 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

3 files changed, 8 insertions, 19 deletions

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index aaa772a..3a03392 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -47,10 +47,12 @@ libavahi_client_la_SOURCES = \
 	browser.c \
 	resolver.c \
 	publish.h lookup.h \
-	xdg-config.c xdg-config.h
+	xdg-config.c xdg-config.h \
+	../avahi-common/dbus.c ../avahi-common/dbus.h \
+	../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.h
 
 libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
-libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la
+libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la
 libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CLIENT_VERSION_INFO)
 
 client_test_SOURCES = client-test.c
diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 912b7a9..ff436ae 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -107,19 +107,5 @@ noinst_HEADERS = \
 	dbus.h \
 	dbus-watch-glue.h
 
-noinst_LTLIBRARIES = \
-	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
 
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 23f5a97..246bd90 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -98,10 +98,11 @@ avahi_daemon_SOURCES += \
 	dbus-sync-address-resolver.c \
 	dbus-sync-host-name-resolver.c \
 	dbus-sync-service-resolver.c \
-	dbus-record-browser.c
-
+	dbus-record-browser.c  \
+        ../avahi-common/dbus.c ../avahi-common/dbus.h \
+	../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.h
+		
 avahi_daemon_LDADD += \
-	../avahi-common/libdbus-common.la \
 	$(DBUS_LIBS)
 
 avahi_daemon_CFLAGS += $(DBUS_CFLAGS)