X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2FMakefile.am;h=d3a1f392f674b213fbf3e8763ba43a40c1a37a63;hb=eee711106f721fc73a1ef50348984b7a1d9cb595;hp=90b908c26eb569e04d81125894686364703562ff;hpb=3b199a0e8d433a6a1ad5d317f15300ec19182fae;p=catta

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 90b908c..d3a1f39 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,25 +17,45 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-SUBDIRS=avahi
+AM_CFLAGS=-I$(top_srcdir)
 
-pythonscripts = \
-	avahi-publish-address \
-	avahi-publish-service \
-	avahi-dump-all \
-	avahi-discover \
-	avahi-bookmarks
+# 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-dump-all.in \
+	avahi-bookmarks.in \
+	avahi-resolve-host-name.in \
+	avahi-resolve-address.in \
 	avahi-discover.in \
-	avahi-bookmarks.in
+	avahi-discover.desktop.in
+
+SUBDIRS=avahi
 
 if HAVE_PYTHON
-bin_SCRIPTS = $(pythonscripts)
-endif
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
+
+pythonscripts = \
+	avahi-publish-address \
+	avahi-publish-service \
+	avahi-bookmarks \
+	avahi-resolve-host-name \
+	avahi-resolve-address \
+	avahi-discover
+
+desktopdir = $(datadir)/applications
+desktop_DATA = avahi-discover.desktop
+
+avahi-discover.desktop: avahi-discover.desktop.in
+	sed -e 's,@bindir\@,$(bindir),g' $< > $@
+	chmod +x $@
+
+avahi-discover: avahi-discover.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+	chmod +x $@
 
 avahi-publish-address: avahi-publish-address.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
@@ -45,17 +65,36 @@ avahi-publish-service: avahi-publish-service.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
-avahi-dump-all: avahi-dump-all.in
+avahi-bookmarks: avahi-bookmarks.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
-avahi-discover: avahi-discover.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
-		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+avahi-resolve-host-name: avahi-resolve-host-name.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
-avahi-bookmarks: avahi-bookmarks.in
+avahi-resolve-address: avahi-resolve-address.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
-CLEANFILES = $(pythonscripts)
+bin_SCRIPTS = $(pythonscripts)
+CLEANFILES = $(pythonscripts) $(desktop_DATA)
+
+endif
+endif
+endif
+
+if HAVE_DBUS
+
+bin_PROGRAMS = avahi-browse
+
+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 -lgdbm
+
+if HAVE_GDBM
+avahi_browse_SOURCES += stdb.h stdb.c
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+endif
+
+endif