From c7a24cd92eeff94503cd2ef831183257baeee0a1 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 23 Sep 2007 18:47:13 +0000 Subject: [PATCH] Move SimpleGladeApp.py into avahi-discover, so that avahi-python doesn't need to depend on python anymore git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1539 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-python/Makefile.am | 31 +-------- avahi-python/avahi-discover/Makefile.am | 67 +++++++++++++++++++ .../SimpleGladeApp.py | 0 avahi-python/avahi-discover/__init__.py | 20 ++++++ .../avahi-discover.desktop.in | 0 .../{ => avahi-discover}/avahi-discover.in | 2 +- avahi-python/avahi/Makefile.am | 4 +- configure.ac | 1 + 8 files changed, 94 insertions(+), 31 deletions(-) create mode 100644 avahi-python/avahi-discover/Makefile.am rename avahi-python/{avahi => avahi-discover}/SimpleGladeApp.py (100%) create mode 100755 avahi-python/avahi-discover/__init__.py rename avahi-python/{ => avahi-discover}/avahi-discover.desktop.in (100%) rename avahi-python/{ => avahi-discover}/avahi-discover.in (99%) diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am index d59b19f..09ad6de 100644 --- a/avahi-python/Makefile.am +++ b/avahi-python/Makefile.am @@ -23,11 +23,9 @@ AM_CFLAGS=-I$(top_srcdir) AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' EXTRA_DIST = \ - avahi-bookmarks.in \ - avahi-discover.in \ - avahi-discover.desktop.in + avahi-bookmarks.in -SUBDIRS=avahi +SUBDIRS=avahi avahi-discover if HAVE_PYTHON if HAVE_PYTHON_DBUS @@ -36,35 +34,12 @@ if HAVE_PYGTK pythonscripts = \ avahi-bookmarks -desktopdir = $(datadir)/applications -desktop_DATA = - -if HAVE_GDBM -pythonscripts += \ - avahi-discover -desktop_DATA += avahi-discover.desktop -endif - -if HAVE_DBM -pythonscripts += \ - avahi-discover -desktop_DATA += avahi-discover.desktop -endif - -avahi-discover.desktop: avahi-discover.desktop.in - sed -e 's,@bindir\@,$(bindir),g' $< > $@ - -avahi-discover: avahi-discover.in - sed -e 's,@PYTHON\@,$(PYTHON),g' \ - -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ - chmod +x $@ - avahi-bookmarks: avahi-bookmarks.in sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ chmod +x $@ bin_SCRIPTS = $(pythonscripts) -CLEANFILES = $(pythonscripts) $(desktop_DATA) +CLEANFILES = $(pythonscripts) endif endif diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am new file mode 100644 index 0000000..c1d6cab --- /dev/null +++ b/avahi-python/avahi-discover/Makefile.am @@ -0,0 +1,67 @@ +# $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) + +EXTRA_DIST = \ + __init__.py \ + SimpleGladeApp.py \ + avahi-discover.in \ + avahi-discover.desktop.in + +if HAVE_PYTHON +if HAVE_PYTHON_DBUS +if HAVE_PYGTK + +pythonscripts = + +desktopdir = $(datadir)/applications +desktop_DATA = + +avahi_discoverdir = $(pythondir)/avahi_discover +avahi_discover_PYTHON = + +if HAVE_GDBM +pythonscripts += \ + avahi-discover +desktop_DATA += avahi-discover.desktop +avahi_discover_PYTHON += __init__.py SimpleGladeApp.py +endif + +if HAVE_DBM +pythonscripts += \ + avahi-discover +desktop_DATA += avahi-discover.desktop +avahi_discover_PYTHON += __init__.py SimpleGladeApp.py +endif + +avahi-discover.desktop: avahi-discover.desktop.in + sed -e 's,@bindir\@,$(bindir),g' $< > $@ + +avahi-discover: avahi-discover.in + sed -e 's,@PYTHON\@,$(PYTHON),g' \ + -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ + chmod +x $@ + +bin_SCRIPTS = $(pythonscripts) +CLEANFILES = $(pythonscripts) $(desktop_DATA) *.pyc *.pyo + +endif +endif +endif diff --git a/avahi-python/avahi/SimpleGladeApp.py b/avahi-python/avahi-discover/SimpleGladeApp.py similarity index 100% rename from avahi-python/avahi/SimpleGladeApp.py rename to avahi-python/avahi-discover/SimpleGladeApp.py diff --git a/avahi-python/avahi-discover/__init__.py b/avahi-python/avahi-discover/__init__.py new file mode 100755 index 0000000..b2cd7d8 --- /dev/null +++ b/avahi-python/avahi-discover/__init__.py @@ -0,0 +1,20 @@ +#!@PYTHON@ +# -*-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. diff --git a/avahi-python/avahi-discover.desktop.in b/avahi-python/avahi-discover/avahi-discover.desktop.in similarity index 100% rename from avahi-python/avahi-discover.desktop.in rename to avahi-python/avahi-discover/avahi-discover.desktop.in diff --git a/avahi-python/avahi-discover.in b/avahi-python/avahi-discover/avahi-discover.in similarity index 99% rename from avahi-python/avahi-discover.in rename to avahi-python/avahi-discover/avahi-discover.in index 23dee80..229c7bd 100755 --- a/avahi-python/avahi-discover.in +++ b/avahi-python/avahi-discover/avahi-discover.in @@ -23,7 +23,7 @@ import os, sys try: import avahi, gtk, gobject, dbus, avahi.ServiceTypeDatabase - from avahi.SimpleGladeApp import SimpleGladeApp + from avahi_discover.SimpleGladeApp import SimpleGladeApp except ImportError, e: print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus.\n Error: %s" % e sys.exit(1) diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am index c974171..2fff218 100644 --- a/avahi-python/avahi/Makefile.am +++ b/avahi-python/avahi/Makefile.am @@ -17,7 +17,7 @@ # 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 @@ -55,7 +55,7 @@ avahi_PYTHON = $(avahi_SCRIPTS) if HAVE_PYGTK if HAVE_PYTHON_DBUS -avahi_PYTHON += __init__.py SimpleGladeApp.py +avahi_PYTHON += __init__.py endif endif diff --git a/configure.ac b/configure.ac index 463f205..7126678 100644 --- a/configure.ac +++ b/configure.ac @@ -997,6 +997,7 @@ avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile avahi-python/avahi/Makefile +avahi-python/avahi-discover/Makefile examples/Makefile common/Makefile man/Makefile -- 2.39.5