fix avahi_netlink_new to allow multiple netlinks per process

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

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 1d542111c767533e9339612952d2a5ed695f4477..3995c0a6da08440a17be3160fda1646c5476e78e 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,31 +15,55 @@
 # 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)
 
-AM_CFLAGS+=$(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(GLADE20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
+interfaces = \
+        avahi-discover.ui
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-if ENABLE_GTK
+if HAVE_GTK2OR3
+if HAVE_GLIB
 bin_PROGRAMS = \
        avahi-discover-standalone
 
 avahi_discover_standalone_SOURCES = \
        main.c
 
-avahi_discover_standalone_CFLAGS = $(AM_CFLAGS)
-avahi_discover_standalone_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+avahi_discover_standalone_CFLAGS = \
+       $(AM_CFLAGS) \
+       -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
 
-interfaces = \
-        avahi-discover.glade
+avahi_discover_standalone_LDADD = \
+       $(AM_LDADD) \
+       ../avahi-common/libavahi-common.la \
+       ../avahi-glib/libavahi-glib.la \
+       ../avahi-core/libavahi-core.la
+
+if HAVE_GTK3
+avahi_discover_standalone_CFLAGS += \
+       $(GLIB30_CFLAGS) $(GTK30_CFLAGS)
+avahi_discover_standalone_LDADD += \
+       $(GLIB30_LIBS) $(GTK30_LIBS)
+else
+avahi_discover_standalone_CFLAGS += \
+       $(GLIB20_CFLAGS) $(GTK20_CFLAGS)
+avahi_discover_standalone_LDADD += \
+       $(GLIB20_LIBS) $(GTK20_LIBS)
+endif
 
 interfaces_DATA = $(interfaces)
 
-EXTRA_DIST = \
-       $(interfaces) \
-       avahi-discover.gladep
+endif  # HAVE_GLIB
+else
+
+if HAVE_PYTHON_DBUS
+
+interfaces_DATA =
+
 endif
+endif
+
+EXTRA_DIST = \
+       $(interfaces)