some more fixes for r504

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

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index f5c69fa..1e10f25 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,38 +17,34 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pythonscripts = \
-       avahi-publish-address \
-       avahi-publish-service \
-       avahi-browse \
-       avahi-bookmarks \
-       avahi-resolve-host-name \
-       avahi-resolve-address
-
 EXTRA_DIST = \
        avahi-publish-address.in \
        avahi-publish-service.in \
        avahi-browse.in \
        avahi-bookmarks.in \
        avahi-resolve-host-name.in \
-       avahi-resolve-address.in
+       avahi-resolve-address.in \
+       avahi-discover.in \
+       avahi-discover.desktop.in
 
+SUBDIRS=avahi
 
 if HAVE_PYTHON
 if HAVE_PYTHON_DBUS
-SUBDIRS=avahi
+if HAVE_PYGTK
 
+pythonscripts = \
+       avahi-publish-address \
+       avahi-publish-service \
+       avahi-browse \
+       avahi-bookmarks \
+       avahi-resolve-host-name \
+       avahi-resolve-address \
+       avahi-discover
 
-if HAVE_PYGTK
 desktopdir = $(datadir)/applications
 desktop_DATA = avahi-discover.desktop
 
-pythonscripts += avahi-discover
-
-EXTRA_DIST += \
-       avahi-discover.in
-       avahi-discover.desktop.in
-
 avahi-discover.desktop: avahi-discover.desktop.in
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
        chmod +x $@
@@ -57,7 +53,6 @@ avahi-discover: avahi-discover.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
                -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
        chmod +x $@
-endif
 
 avahi-publish-address: avahi-publish-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
@@ -82,8 +77,10 @@ avahi-resolve-host-name: avahi-resolve-host-name.in
 avahi-resolve-address: avahi-resolve-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
-endif
-endif
 
 bin_SCRIPTS = $(pythonscripts)
 CLEANFILES = $(pythonscripts) $(desktop_DATA)
+
+endif
+endif
+endif

diff --git a/avahi-utils/avahi/Makefile.am b/avahi-utils/avahi/Makefile.am
index 53e56a3..6800634 100644 (file)
--- a/avahi-utils/avahi/Makefile.am
+++ b/avahi-utils/avahi/Makefile.am
@@ -20,18 +20,25 @@
 EXTRA_DIST = __init__.py SimpleGladeApp.py ServiceTypeDatabase.py.in
 
 if HAVE_PYTHON
+
 avahidir = $(pythondir)/avahi
 
-avahi_PYTHON = __init__.py SimpleGladeApp.py 
 avahi_SCRIPTS = ServiceTypeDatabase.py
 
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
+
+avahi_PYTHON = __init__.py SimpleGladeApp.py 
+
 ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
        chmod +x $@
 
-CLEANFILES=*.pyc *.pyo ServiceTypeDatabase.py
-
 endif
+endif
+endif
+
+CLEANFILES=*.pyc *.pyo ServiceTypeDatabase.py