From ced0d86acf70f435ffdadb794db891be63a5b82a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 Nov 2005 00:39:45 +0000 Subject: [PATCH] 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 --- Makefile.am | 1 + avahi-python/Makefile.am | 73 +++++++++++++++++++ .../avahi-bookmarks.in | 0 .../avahi-discover.desktop.in | 0 .../avahi-discover.in | 0 .../avahi-publish-address.in | 0 .../avahi-publish-service.in | 0 .../avahi/Makefile.am | 0 .../avahi/ServiceTypeDatabase.py.in | 0 .../avahi/SimpleGladeApp.py | 0 .../avahi/__init__.py | 0 avahi-utils/Makefile.am | 50 ------------- configure.ac | 3 +- 13 files changed, 76 insertions(+), 51 deletions(-) create mode 100644 avahi-python/Makefile.am rename {avahi-utils => avahi-python}/avahi-bookmarks.in (100%) rename {avahi-utils => avahi-python}/avahi-discover.desktop.in (100%) rename {avahi-utils => avahi-python}/avahi-discover.in (100%) rename {avahi-utils => avahi-python}/avahi-publish-address.in (100%) rename {avahi-utils => avahi-python}/avahi-publish-service.in (100%) rename {avahi-utils => avahi-python}/avahi/Makefile.am (100%) rename {avahi-utils => avahi-python}/avahi/ServiceTypeDatabase.py.in (100%) rename {avahi-utils => avahi-python}/avahi/SimpleGladeApp.py (100%) rename {avahi-utils => avahi-python}/avahi/__init__.py (100%) 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 similarity index 100% rename from avahi-utils/avahi-bookmarks.in rename to avahi-python/avahi-bookmarks.in diff --git a/avahi-utils/avahi-discover.desktop.in b/avahi-python/avahi-discover.desktop.in similarity index 100% rename from avahi-utils/avahi-discover.desktop.in rename to avahi-python/avahi-discover.desktop.in diff --git a/avahi-utils/avahi-discover.in b/avahi-python/avahi-discover.in similarity index 100% rename from avahi-utils/avahi-discover.in rename to avahi-python/avahi-discover.in diff --git a/avahi-utils/avahi-publish-address.in b/avahi-python/avahi-publish-address.in similarity index 100% rename from avahi-utils/avahi-publish-address.in rename to avahi-python/avahi-publish-address.in diff --git a/avahi-utils/avahi-publish-service.in b/avahi-python/avahi-publish-service.in similarity index 100% rename from avahi-utils/avahi-publish-service.in rename to avahi-python/avahi-publish-service.in diff --git a/avahi-utils/avahi/Makefile.am b/avahi-python/avahi/Makefile.am similarity index 100% rename from avahi-utils/avahi/Makefile.am rename to avahi-python/avahi/Makefile.am diff --git a/avahi-utils/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in similarity index 100% rename from avahi-utils/avahi/ServiceTypeDatabase.py.in rename to avahi-python/avahi/ServiceTypeDatabase.py.in diff --git a/avahi-utils/avahi/SimpleGladeApp.py b/avahi-python/avahi/SimpleGladeApp.py similarity index 100% rename from avahi-utils/avahi/SimpleGladeApp.py rename to avahi-python/avahi/SimpleGladeApp.py diff --git a/avahi-utils/avahi/__init__.py b/avahi-python/avahi/__init__.py similarity index 100% rename from avahi-utils/avahi/__init__.py rename to 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 -- 2.39.5