summaryrefslogtreecommitdiffstats
path: root/avahi-client
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-24 02:03:21 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-24 02:03:21 +0000
commitef51c776fa80e67b84e2a6d48829f9040ac76c20 (patch)
tree613d6ec4b3af4a3ec9e129c5587fd6b4258afcd2 /avahi-client
parentbe4aaeb485d31dee095b0c9c90e6b79333bc0e21 (diff)
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
Diffstat (limited to 'avahi-client')
-rw-r--r--avahi-client/Makefile.am6
1 files changed, 4 insertions, 2 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