X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-discover-standalone%2FMakefile.am;h=1163575fedbb6ed27a2b86b37ccf0a394d83dc64;hb=e11fda547143d8b1e931d77f1661668d41473c73;hp=bbf1895bf1340f1ee733f15986e40d31ad7ed3c8;hpb=b70de951352c60e6203648253cdbdda2bc93c136;p=catta

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index bbf1895..1163575 100644
--- 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
@@ -20,12 +18,13 @@
 AM_CFLAGS=-I$(top_srcdir)
 
 interfaces = \
-        avahi-discover.glade
+        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
 
@@ -34,7 +33,7 @@ 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 = \
@@ -42,21 +41,19 @@ avahi_discover_standalone_LDADD = \
 	../avahi-common/libavahi-common.la \
 	../avahi-glib/libavahi-glib.la \
 	../avahi-core/libavahi-core.la  \
-	$(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
+	$(GLIB20_LIBS) $(GTK20_LIBS)
 
 interfaces_DATA = $(interfaces)
 
-else 
+endif  # HAVE_GLIB
+else
 
-if HAVE_PYTHON 
-if HAVE_DBUS
+if HAVE_PYTHON_DBUS
 
-interfaces_DATA = $(interfaces)
+interfaces_DATA =
 
-endif
 endif
 endif
 
 EXTRA_DIST = \
-	$(interfaces) \
-	avahi-discover.gladep
+	$(interfaces)