limit allowed flags to avahi_server_add_service_subtype()

[catta] / avahi-utils / Makefile.am

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 0079795d9b981436f8dcfcd3b74cbfb928388042..1e10f2592e8a87fef8433e5301220aece2ce7f4e 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,23 +17,42 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+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_PYTHON_DBUS
+if HAVE_PYGTK
+
 pythonscripts = \
        avahi-publish-address \
        avahi-publish-service \
-       avahi-dump-all \
-       avahi-discover 
+       avahi-browse \
+       avahi-bookmarks \
+       avahi-resolve-host-name \
+       avahi-resolve-address \
+       avahi-discover
 
-EXTRA_DIST = \
-       avahi-publish-address.in \
-       avahi-publish-service.in \
-       avahi-dump-all.in \
-       avahi-discover.in 
+desktopdir = $(datadir)/applications
+desktop_DATA = avahi-discover.desktop
 
-if HAVE_PYTHON
-bin_SCRIPTS = $(pythonscripts)
-endif
+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' $< > $@
@@ -43,13 +62,25 @@ 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' $< > $@
+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 $@
 
-CLEANFILES = $(pythonscripts)
+avahi-resolve-address: avahi-resolve-address.in
+       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+       chmod +x $@
+
+bin_SCRIPTS = $(pythonscripts)
+CLEANFILES = $(pythonscripts) $(desktop_DATA)
+
+endif
+endif
+endif