get rid of a lot of old svn cruft

[catta] / avahi-python / avahi-discover / Makefile.am

diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
index c1d6cabc6dffd93a40f6ebb77da6ecc0d4b9e4ab..454fd57efec6c1a720e5b8779804208926dc5cf6 100644 (file)
--- a/avahi-python/avahi-discover/Makefile.am
+++ b/avahi-python/avahi-discover/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
@@ -21,9 +19,8 @@ AM_CFLAGS=-I$(top_srcdir)
 
 EXTRA_DIST = \
        __init__.py \
-       SimpleGladeApp.py \
        avahi-discover.in \
-       avahi-discover.desktop.in
+       avahi-discover.desktop.in.in
 
 if HAVE_PYTHON
 if HAVE_PYTHON_DBUS
@@ -32,7 +29,7 @@ if HAVE_PYGTK
 pythonscripts =
 
 desktopdir = $(datadir)/applications
-desktop_DATA = 
+desktop_DATA =
 
 avahi_discoverdir = $(pythondir)/avahi_discover
 avahi_discover_PYTHON =
@@ -41,26 +38,31 @@ if HAVE_GDBM
 pythonscripts += \
        avahi-discover
 desktop_DATA += avahi-discover.desktop
-avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+@INTLTOOL_DESKTOP_RULE@
+avahi_discover_PYTHON += __init__.py
 endif
 
 if HAVE_DBM
 pythonscripts += \
        avahi-discover
 desktop_DATA += avahi-discover.desktop
-avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+@INTLTOOL_DESKTOP_RULE@
+avahi_discover_PYTHON += __init__.py
 endif
 
-avahi-discover.desktop: avahi-discover.desktop.in
-       sed -e 's,@bindir\@,$(bindir),g' $< > $@
+avahi-discover.desktop.in: avahi-discover.desktop.in.in
+       $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
 avahi-discover: avahi-discover.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' \
-               -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+       $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \
+               -e 's,@LOCALEDIR\@,"$(datadir)/locale",g' \
+               -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ && \
        chmod +x $@
 
 bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA) *.pyc *.pyo
+
+CLEANFILES = $(pythonscripts) $(desktop_DATA) *.pyc *.pyo avahi-discover.desktop.in
 
 endif
 endif