get rid of a lot of old svn cruft

[catta] / examples / Makefile.am

diff --git a/examples/Makefile.am b/examples/Makefile.am
index fa264564b2a3ae90b92ff2319bf0af1aae01a598..dbb7f007dcd39c6d2684f4ea0330843d1fe94b72 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -19,9 +17,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 +31,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,4 +47,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
 
+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