X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2FMakefile.am;h=f5c69fa35651a103768794513f9ea3c631a466ec;hb=14e31e958eb9d280cfe544bc3379d19255badd21;hp=144ee1288cca72bd76b66d4b2d9ab27bc966d08d;hpb=0632e854728e8e64552ae08f90852d4a2658539e;p=catta

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 144ee12..f5c69fa 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,13 +17,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-SUBDIRS=avahi
-
 pythonscripts = \
 	avahi-publish-address \
 	avahi-publish-service \
-	avahi-dump-all \
-	avahi-discover \
+	avahi-browse \
 	avahi-bookmarks \
 	avahi-resolve-host-name \
 	avahi-resolve-address
@@ -31,14 +28,35 @@ pythonscripts = \
 EXTRA_DIST = \
 	avahi-publish-address.in \
 	avahi-publish-service.in \
-	avahi-dump-all.in \
-	avahi-discover.in \
+	avahi-browse.in \
 	avahi-bookmarks.in \
 	avahi-resolve-host-name.in \
 	avahi-resolve-address.in
 
+
 if HAVE_PYTHON
-bin_SCRIPTS = $(pythonscripts)
+if HAVE_PYTHON_DBUS
+SUBDIRS=avahi
+
+
+if HAVE_PYGTK
+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 $@
+
+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
@@ -49,15 +67,10 @@ avahi-publish-service: avahi-publish-service.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
-avahi-dump-all: avahi-dump-all.in
+avahi-browse: avahi-browse.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' $< > $@
-	chmod +x $@
-
 avahi-bookmarks: avahi-bookmarks.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
@@ -69,5 +82,8 @@ avahi-resolve-host-name: avahi-resolve-host-name.in
 avahi-resolve-address: avahi-resolve-address.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
+endif
+endif
 
-CLEANFILES = $(pythonscripts)
+bin_SCRIPTS = $(pythonscripts)
+CLEANFILES = $(pythonscripts) $(desktop_DATA)