Replace libglade with GtkBuilder

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

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 5b93c42dc5d4794d02e3eba6e55e04decd9194f2..133ff4d9c5ba7354714556c2f9ef49feca5f4667 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -17,14 +17,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,32 +35,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)
+       $(GLIB20_LIBS) $(GTK20_LIBS)
 
 interfaces_DATA = $(interfaces)
 
+endif  # HAVE_GLIB
 else 
 
-if HAVE_PYTHON 
-if HAVE_DBUS
+if HAVE_PYTHON_DBUS
 
-# We need this for the python version of avahi-discover
-interfaces_DATA = $(interfaces)
+interfaces_DATA =
 
 endif
 endif
-endif
-
-interfaces = \
-        avahi-discover.glade
 
 EXTRA_DIST = \
-       $(interfaces) \
-       avahi-discover.gladep
+       $(interfaces)