From cc0a4994f07b61952a77549fffa1711014f936be Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Thu, 4 Aug 2005 00:45:33 +0000 Subject: * add some autoconf check for pygtk and gtk.glade * moved autoconf/automake doxygen macro in common/ * remove autogenerated py-compile git-svn-id: file:///home/lennart/svn/public/avahi/trunk@224 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-utils/Makefile.am | 6 ++---- avahi-utils/avahi-publish-service.in | 5 ++--- avahi-utils/avahi/Makefile.am | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'avahi-utils') diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am index 54ac083..64781d2 100644 --- a/avahi-utils/Makefile.am +++ b/avahi-utils/Makefile.am @@ -19,10 +19,8 @@ SUBDIRS=avahi -avahiscriptsdir = $(bindir) - if HAVE_PYTHON -avahiscripts_SCRIPTS = avahi-publish-address avahi-publish-service avahi-dump-all +bin_SCRIPTS = avahi-publish-address avahi-publish-service avahi-dump-all endif -EXTRA_DITS = avahi-publish-address.in avahi-publish-service.in avahi-dump-all.in +CLEANFILES = $(bin_SCRIPTS) diff --git a/avahi-utils/avahi-publish-service.in b/avahi-utils/avahi-publish-service.in index ee0be76..123e376 100755 --- a/avahi-utils/avahi-publish-service.in +++ b/avahi-utils/avahi-publish-service.in @@ -36,7 +36,7 @@ def usage(retval = 0): try: opts, args = getopt.getopt(sys.argv[1:], "d:H:", ["help", "domain=", "host="]) except getopt.GetoptError: - usage(2) + pass domain = "" host = "" @@ -52,8 +52,7 @@ for o, a in opts: host = a if len(args) < 3: - sys.stderr.write("Invalid number of arguments\n") - sys.exit(1) + usage(2) name = args[0] stype = args[1] diff --git a/avahi-utils/avahi/Makefile.am b/avahi-utils/avahi/Makefile.am index 248bf69..5ea7a6a 100644 --- a/avahi-utils/avahi/Makefile.am +++ b/avahi-utils/avahi/Makefile.am @@ -24,3 +24,6 @@ avahi_PYTHON = __init__.py SimpleGladeApp.py endif EXTRA_DIST = __init__.py SimpleGladeApp.py + +clean-local: + rm -rf *.pyc *.pyo -- cgit