summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-15 00:39:45 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-15 00:39:45 +0000
commitced0d86acf70f435ffdadb794db891be63a5b82a (patch)
tree2cad1e6412804127de11fc7b2338b155ad01925e
parent2d48326e6731cb9266119cd531daac0bbf683f44 (diff)
move python tools from avahi-utils to avahi-python
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@969 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--Makefile.am1
-rw-r--r--avahi-python/Makefile.am73
-rwxr-xr-xavahi-python/avahi-bookmarks.in (renamed from avahi-utils/avahi-bookmarks.in)0
-rw-r--r--avahi-python/avahi-discover.desktop.in (renamed from avahi-utils/avahi-discover.desktop.in)0
-rwxr-xr-xavahi-python/avahi-discover.in (renamed from avahi-utils/avahi-discover.in)0
-rwxr-xr-xavahi-python/avahi-publish-address.in (renamed from avahi-utils/avahi-publish-address.in)0
-rwxr-xr-xavahi-python/avahi-publish-service.in (renamed from avahi-utils/avahi-publish-service.in)0
-rw-r--r--avahi-python/avahi/Makefile.am (renamed from avahi-utils/avahi/Makefile.am)0
-rw-r--r--avahi-python/avahi/ServiceTypeDatabase.py.in (renamed from avahi-utils/avahi/ServiceTypeDatabase.py.in)0
-rw-r--r--avahi-python/avahi/SimpleGladeApp.py (renamed from avahi-utils/avahi/SimpleGladeApp.py)0
-rw-r--r--avahi-python/avahi/__init__.py (renamed from avahi-utils/avahi/__init__.py)0
-rw-r--r--avahi-utils/Makefile.am50
-rw-r--r--configure.ac3
13 files changed, 76 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am
index d557c62..f2e3b39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ SUBDIRS = \
initscript \
avahi-dnsconfd \
avahi-utils \
+ avahi-python \
examples \
man \
tests \
diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am
new file mode 100644
index 0000000..efb529e
--- /dev/null
+++ b/avahi-python/Makefile.am
@@ -0,0 +1,73 @@
+# $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.
+
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+EXTRA_DIST = \
+ avahi-publish-address.in \
+ avahi-publish-service.in \
+ avahi-bookmarks.in \
+ avahi-discover.in \
+ avahi-discover.desktop.in
+
+SUBDIRS=avahi
+
+if HAVE_PYTHON
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
+
+pythonscripts = \
+ avahi-publish-address \
+ avahi-publish-service \
+ avahi-bookmarks \
+ avahi-discover
+
+desktopdir = $(datadir)/applications
+desktop_DATA = avahi-discover.desktop
+
+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-publish-address: avahi-publish-address.in
+ sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+ chmod +x $@
+
+avahi-publish-service: avahi-publish-service.in
+ sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+ chmod +x $@
+
+avahi-bookmarks: avahi-bookmarks.in
+ sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+ chmod +x $@
+
+bin_SCRIPTS = $(pythonscripts)
+CLEANFILES = $(pythonscripts) $(desktop_DATA)
+
+endif
+endif
+endif
diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-python/avahi-bookmarks.in
index 2de9186..2de9186 100755
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-python/avahi-bookmarks.in
diff --git a/avahi-utils/avahi-discover.desktop.in b/avahi-python/avahi-discover.desktop.in
index 2362cd4..2362cd4 100644
--- a/avahi-utils/avahi-discover.desktop.in
+++ b/avahi-python/avahi-discover.desktop.in
diff --git a/avahi-utils/avahi-discover.in b/avahi-python/avahi-discover.in
index 00a5602..00a5602 100755
--- a/avahi-utils/avahi-discover.in
+++ b/avahi-python/avahi-discover.in
diff --git a/avahi-utils/avahi-publish-address.in b/avahi-python/avahi-publish-address.in
index 4ffebd7..4ffebd7 100755
--- a/avahi-utils/avahi-publish-address.in
+++ b/avahi-python/avahi-publish-address.in
diff --git a/avahi-utils/avahi-publish-service.in b/avahi-python/avahi-publish-service.in
index 3f40fd0..3f40fd0 100755
--- a/avahi-utils/avahi-publish-service.in
+++ b/avahi-python/avahi-publish-service.in
diff --git a/avahi-utils/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index b1ebe22..b1ebe22 100644
--- a/avahi-utils/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
diff --git a/avahi-utils/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
index 9caeebd..9caeebd 100644
--- a/avahi-utils/avahi/ServiceTypeDatabase.py.in
+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
diff --git a/avahi-utils/avahi/SimpleGladeApp.py b/avahi-python/avahi/SimpleGladeApp.py
index 90c598c..90c598c 100644
--- a/avahi-utils/avahi/SimpleGladeApp.py
+++ b/avahi-python/avahi/SimpleGladeApp.py
diff --git a/avahi-utils/avahi/__init__.py b/avahi-python/avahi/__init__.py
index c10b85d..c10b85d 100644
--- a/avahi-utils/avahi/__init__.py
+++ b/avahi-python/avahi/__init__.py
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 2066e4f..846b9ce 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -22,56 +22,6 @@ AM_CFLAGS=-I$(top_srcdir)
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-EXTRA_DIST = \
- avahi-publish-address.in \
- avahi-publish-service.in \
- avahi-bookmarks.in \
- avahi-discover.in \
- avahi-discover.desktop.in
-
-SUBDIRS=avahi
-
-if HAVE_PYTHON
-if HAVE_PYTHON_DBUS
-if HAVE_PYGTK
-
-pythonscripts = \
- avahi-publish-address \
- avahi-publish-service \
- avahi-bookmarks \
- avahi-discover
-
-desktopdir = $(datadir)/applications
-desktop_DATA = avahi-discover.desktop
-
-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-publish-address: avahi-publish-address.in
- sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
- chmod +x $@
-
-avahi-publish-service: avahi-publish-service.in
- sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
- chmod +x $@
-
-avahi-bookmarks: avahi-bookmarks.in
- sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
- chmod +x $@
-
-bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
-
-endif
-endif
-endif
-
if HAVE_DBUS
bin_PROGRAMS = avahi-browse avahi-resolve-host-name
diff --git a/configure.ac b/configure.ac
index a8a16c4..0f5e28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -707,7 +707,8 @@ initscript/fedora/Makefile
initscript/darwin/Makefile
avahi-dnsconfd/Makefile
avahi-utils/Makefile
-avahi-utils/avahi/Makefile
+avahi-python/Makefile
+avahi-python/avahi/Makefile
examples/Makefile
common/Makefile
man/Makefile