get rid of a lot of old svn cruft

[catta] / avahi-discover-standalone / Makefile.am

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 7145e0f7ba6723ff7bddae49fbd940f5c5de957a..1163575fedbb6ed27a2b86b37ccf0a394d83dc64 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/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
@@ -17,14 +15,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=\
-       -I$(top_srcdir) \
-       -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
+AM_CFLAGS=-I$(top_srcdir)
+
+interfaces = \
+        avahi-discover.ui
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
+if  HAVE_GLIB
 bin_PROGRAMS = \
        avahi-discover-standalone
 
@@ -33,21 +33,27 @@ avahi_discover_standalone_SOURCES = \
 
 avahi_discover_standalone_CFLAGS = \
        $(AM_CFLAGS) \
-       $(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(GLADE20_CFLAGS)
+       $(GLIB20_CFLAGS) $(GTK20_CFLAGS) \
+       -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
 
 avahi_discover_standalone_LDADD = \
        $(AM_LDADD) \
        ../avahi-common/libavahi-common.la \
        ../avahi-glib/libavahi-glib.la \
        ../avahi-core/libavahi-core.la  \
-       $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
-
-interfaces = \
-        avahi-discover.glade
+       $(GLIB20_LIBS) $(GTK20_LIBS)
 
 interfaces_DATA = $(interfaces)
 
-EXTRA_DIST = \
-       $(interfaces) \
-       avahi-discover.gladep
+endif  # HAVE_GLIB
+else
+
+if HAVE_PYTHON_DBUS
+
+interfaces_DATA =
+
 endif
+endif
+
+EXTRA_DIST = \
+       $(interfaces)