Move SimpleGladeApp.py into avahi-discover, so that avahi-python doesn't need to...

[catta] / avahi-python / Makefile.am

diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am
index d59b19f310e9df4a6fcd18dba62d3984a7f7ab51..09ad6de6f736a274b16a1a5f9c13ab767289e9c6 100644 (file)
--- a/avahi-python/Makefile.am
+++ b/avahi-python/Makefile.am
@@ -23,11 +23,9 @@ 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
@@ -36,35 +34,12 @@ 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' $< > $@
-
-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 $@
 
 bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
+CLEANFILES = $(pythonscripts)
 
 endif
 endif