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

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

diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index b1ebe22a69567a10eae8cab2019ae483c7f05c15..2fff2189f3bb66e19cc3b0fd649842f77823e7fd 100644 (file)
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
@@ -17,28 +17,48 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = __init__.py SimpleGladeApp.py ServiceTypeDatabase.py.in
+EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
 
 if HAVE_PYTHON
 
 avahidir = $(pythondir)/avahi
 
-avahi_SCRIPTS = ServiceTypeDatabase.py
+
+if HAVE_GDBM
+nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
+
+ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
+       sed -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@DBM\@,gdbm,g' \
+               -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
+               -e 's,@CHECK_KEY\@,while key is not None:,g' \
+               -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
+               -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+       chmod +x $@
+endif
+
+if HAVE_DBM
+nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
 
 ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@DBM\@,dbm,g' \
+               -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
+               -e 's,@CHECK_KEY\@,for key in keys:,g' \
+               -e 's,@NEXT_KEY\@,,g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
        chmod +x $@
+endif
+
+avahi_PYTHON = $(avahi_SCRIPTS)
 
 if HAVE_PYGTK
 if HAVE_PYTHON_DBUS
 
-avahi_PYTHON = __init__.py SimpleGladeApp.py 
+avahi_PYTHON += __init__.py
 
 endif
 endif
 endif
 
 CLEANFILES=*.pyc *.pyo ServiceTypeDatabase.py
-
-