integrate the service type database into the build system

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@454 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/Makefile.am b/Makefile.am
index 6fd3beaacab75499f4985609622383c591639525..f1a337fb64ed89fe2443d97d266cf3407f088b0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,8 @@ SUBDIRS = \
        avahi-utils \
        examples \
        man \
-       tests
+       tests \
+       service-type-database
 
 DX_INPUT = \
        $(srcdir)/avahi-common/cdecl.h \

diff --git a/configure.ac b/configure.ac
index 981c02a41ad4a2c1565ef9e4110f19a30eb3a673..e3be4f766216d8e72255e175e8e37088232399de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,7 @@ examples/Makefile
 common/Makefile
 man/Makefile
 tests/Makefile
+service-type-database/Makefile
 ])
 AC_OUTPUT
 

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
new file mode 100644 (file)
index 0000000..171de57
--- /dev/null
+++ b/service-type-database/Makefile.am
@@ -0,0 +1,38 @@
+# $Id$
+#
+# This file is part of avahi.
+# 
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+EXTRA_DIST=build-db.in service-types
+
+pkgdata_DATA=service-types
+
+if HAVE_PYTHON
+
+noinst_SCRIPTS=build-db
+pkgdata_DATA+=service-types.db
+
+build-db: build-db.in
+       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+       chmod +x $@
+
+service-types.db: service-types
+       $(PYTHON) build-db $<
+
+CLEANFILES = service-types.db build-db
+
+endif

diff --git a/service-type-database/build-db b/service-type-database/build-db
deleted file mode 100755 (executable)
index 1cc7309..0000000
--- a/service-type-database/build-db
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-
-# $Id$
-
-# This file is part of avahi.
-#
-# avahi is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# avahi is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with avahi; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-import dbm, sys
-
-if len(sys.argv) > 1:
-    fn = sys.argv[1]
-else:
-    fn = "service-types"
-
-db = dbm.open(fn, "n")
-
-for ln in file(fn, "r"):
-    ln = ln.strip(" \r\n\t")
-    
-    if ln == "" or ln.startswith("#"):
-        continue
-
-    t, n = ln.split(":", 1)
-
-    db[t.strip()] = n.strip()
-
-db.close()

diff --git a/service-type-database/build-db.in b/service-type-database/build-db.in
new file mode 100755 (executable)
index 0000000..16a50e4
--- /dev/null
+++ b/service-type-database/build-db.in
@@ -0,0 +1,41 @@
+#!@PYTHON@
+
+# $Id$
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+import dbm, sys
+
+if len(sys.argv) > 1:
+    fn = sys.argv[1]
+else:
+    fn = "service-types"
+
+db = dbm.open(fn, "n")
+
+for ln in file(fn, "r"):
+    ln = ln.strip(" \r\n\t")
+    
+    if ln == "" or ln.startswith("#"):
+        continue
+
+    t, n = ln.split(":", 1)
+
+    db[t.strip()] = n.strip()
+
+db.close()