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 d1cba37b0d8795ac9c9c82c78f147621f66f539b..3a033922e78b531f24bcd623bbbf167ad736638d 100644 (file)
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -25,11 +25,19 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 if HAVE_DBUS
 
 avahi_clientincludedir=$(includedir)/avahi-client
-avahi_clientinclude_HEADERS = client.h
+avahi_clientinclude_HEADERS = client.h lookup.h publish.h
 
 noinst_HEADERS = internal.h
 
-noinst_PROGRAMS = client-test
+if ENABLE_TESTS
+
+noinst_PROGRAMS = \
+       client-test \
+       srv-test \
+       xdg-config-test \
+       rr-test
+
+endif
 
 lib_LTLIBRARIES = libavahi-client.la 
 
@@ -37,14 +45,30 @@ libavahi_client_la_SOURCES = \
        client.c client.h \
        entrygroup.c \
        browser.c \
-       resolver.c
+       resolver.c \
+       publish.h lookup.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)
-libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common.la
-libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+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
+libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CLIENT_VERSION_INFO)
 
 client_test_SOURCES = client-test.c
 client_test_CFLAGS = $(AM_CFLAGS) 
 client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
 
+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)
+
 endif