* merge the python dict support in trunk

[catta] / avahi-utils / Makefile.am

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 3adf84c506b601804e8ce9efbce4b4cf213580e8..2066e4f8e8cd4e37829dcf7dac6ad4504d055df3 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,38 +17,33 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pythonscripts = \
-       avahi-publish-address \
-       avahi-publish-service \
-       avahi-browse \
-       avahi-bookmarks \
-       avahi-resolve-host-name \
-       avahi-resolve-address
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 EXTRA_DIST = \
        avahi-publish-address.in \
        avahi-publish-service.in \
-       avahi-browse.in \
        avahi-bookmarks.in \
-       avahi-resolve-host-name.in \
-       avahi-resolve-address.in
+       avahi-discover.in \
+       avahi-discover.desktop.in
 
+SUBDIRS=avahi
 
 if HAVE_PYTHON
-if HAVE_DBUS
-SUBDIRS=avahi
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
 
+pythonscripts = \
+       avahi-publish-address \
+       avahi-publish-service \
+       avahi-bookmarks \
+       avahi-discover
 
-if HAVE_GTK
 desktopdir = $(datadir)/applications
 desktop_DATA = avahi-discover.desktop
 
-pythonscripts += avahi-discover
-
-EXTRA_DIST += \
-       avahi-discover.in
-       avahi-discover.desktop.in
-
 avahi-discover.desktop: avahi-discover.desktop.in
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
        chmod +x $@
@@ -57,7 +52,6 @@ avahi-discover: avahi-discover.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
                -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
        chmod +x $@
-endif
 
 avahi-publish-address: avahi-publish-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
@@ -67,23 +61,33 @@ avahi-publish-service: avahi-publish-service.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
-avahi-browse: avahi-browse.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-       chmod +x $@
-
 avahi-bookmarks: avahi-bookmarks.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
-avahi-resolve-host-name: avahi-resolve-host-name.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-       chmod +x $@
+bin_SCRIPTS = $(pythonscripts)
+CLEANFILES = $(pythonscripts) $(desktop_DATA)
 
-avahi-resolve-address: avahi-resolve-address.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-       chmod +x $@
+endif
 endif
 endif
 
-bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
+if HAVE_DBUS
+
+bin_PROGRAMS = avahi-browse avahi-resolve-host-name
+
+avahi_browse_SOURCES = avahi-browse.c sigint.c sigint.h
+avahi_browse_CFLAGS = $(AM_CFLAGS)
+avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
+if HAVE_GDBM
+avahi_browse_SOURCES += stdb.h stdb.c
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_LDADD += -lgdbm
+endif
+
+avahi_resolve_host_name_SOURCES = avahi-resolve-host-name.c sigint.c sigint.h
+avahi_resolve_host_name_CFLAGS = $(AM_CFLAGS)
+avahi_resolve_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
+endif