handle both cases of local collision

[catta] / examples / Makefile.am

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 137dd55e72d300f506dc34061381a7cfc77ef2f9..e6e66f58deecc682326600f073468539a5caaace 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,9 +19,11 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
        core-publish-service \
        core-browse-services
+endif
 
 core_publish_service_SOURCES = core-publish-service.c
 core_publish_service_CFLAGS = $(AM_CFLAGS)
@@ -31,12 +33,14 @@ 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
@@ -45,14 +49,17 @@ 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
 
-endif
-
-if HAVE_GTK
+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