combine avahi-core and avahi-common components into one library

[catta] / examples / Makefile.am

diff --git a/examples/Makefile.am b/examples/Makefile.am
index dbb7f007dcd39c6d2684f4ea0330843d1fe94b72..aff7d3c1906585906de79abc8a70f63c5f9805f7 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -25,39 +25,8 @@ endif
 
 core_publish_service_SOURCES = core-publish-service.c
 core_publish_service_CFLAGS = $(AM_CFLAGS)
-core_publish_service_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+core_publish_service_LDADD = $(AM_LDADD) ../avahi/libavahi.la
 
 core_browse_services_SOURCES = core-browse-services.c
 core_browse_services_CFLAGS = $(AM_CFLAGS)
-core_browse_services_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
-
-if HAVE_DBUS
-if ENABLE_TESTS
-
-noinst_PROGRAMS += \
-       client-publish-service \
-       client-browse-services
-endif
-
-client_publish_service_SOURCES = client-publish-service.c
-client_publish_service_CFLAGS = $(AM_CFLAGS)
-client_publish_service_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
-
-client_browse_services_SOURCES = client-browse-services.c
-client_browse_services_CFLAGS = $(AM_CFLAGS)
-client_browse_services_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
-
-if HAVE_GLIB
-
-if ENABLE_TESTS
-noinst_PROGRAMS += \
-       glib-integration
-endif
-
-glib_integration_SOURCES = glib-integration.c
-glib_integration_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-glib_integration_LDADD = $(AM_LDADD) $(GLIB20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la ../avahi-glib/libavahi-glib.la
-
-endif
-
-endif
+core_browse_services_LDADD = $(AM_LDADD) ../avahi/libavahi.la