X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-python%2FMakefile.am;h=7381a48b55b61b81c0539a3c277d42ac4e8a3718;hb=938b5f883fbaa642e3acb7720e37f95f3d72be62;hp=0800506c590e03f096faec498846acfcca599a02;hpb=5183633d2f84c0e2a0342f49c9cab275adb43ed8;p=catta

diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am
index 0800506..7381a48 100644
--- a/avahi-python/Makefile.am
+++ b/avahi-python/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -23,50 +21,22 @@ AM_CFLAGS=-I$(top_srcdir)
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 EXTRA_DIST = \
-	avahi-bookmarks.in \
-	avahi-discover.in \
-	avahi-discover.desktop.in
+	avahi-bookmarks.in
 
-SUBDIRS=avahi
+SUBDIRS=avahi avahi-discover
 
 if HAVE_PYTHON
 if HAVE_PYTHON_DBUS
-if HAVE_PYGTK
 
 pythonscripts = \
 	avahi-bookmarks
 
-desktopdir = $(datadir)/applications
-desktop_DATA = 
-
-if HAVE_GDBM
-pythonscripts += \
-	avahi-discover
-desktop_DATA += avahi-discover.desktop
-endif
-
-if HAVE_DBM
-pythonscripts += \
-	avahi-discover
-desktop_DATA += avahi-discover.desktop
-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-bookmarks: avahi-bookmarks.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ && \
 	chmod +x $@
 
 bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
+CLEANFILES = $(pythonscripts)
 
 endif
 endif
-endif