don't build static library for dbus-watch-glue and the like, instead compile the...

[catta] / avahi-client / Makefile.am

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index 463ea395959eb84ac7de2d5f48be50524e020002..3a033922e78b531f24bcd623bbbf167ad736638d 100644 (file)
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -34,7 +34,8 @@ if ENABLE_TESTS
 noinst_PROGRAMS = \
        client-test \
        srv-test \
-       xdg-config-test
+       xdg-config-test \
+       rr-test
 
 endif
 
@@ -46,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
@@ -60,6 +63,10 @@ srv_test_SOURCES = srv-test.c
 srv_test_CFLAGS = $(AM_CFLAGS) 
 srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
 
+rr_test_SOURCES = rr-test.c
+rr_test_CFLAGS = $(AM_CFLAGS) 
+rr_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
+
 xdg_config_test_SOURCES = xdg-config-test.c xdg-config.c xdg-config.h
 xdg_config_test_CFLAGS = $(AM_CFLAGS) 
 xdg_config_test_LDADD = $(AM_LDADD)