* avahi-utils: replace python avahi-browse with a version written in C.

[catta] / avahi-utils / Makefile.am

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index edbd2cbb65f3db219b5c3749d9985824b98ddac6..0c5b711b871b968700f24298a0389dbcf81930b2 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,55 +17,49 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pythonscripts = \
-       avahi-publish-address \
-       avahi-publish-service \
-       avahi-browse \
-       avahi-discover \
-       avahi-bookmarks \
-       avahi-resolve-host-name \
-       avahi-resolve-address
-
 EXTRA_DIST = \
        avahi-publish-address.in \
        avahi-publish-service.in \
-       avahi-browse.in \
-       avahi-discover.in \
        avahi-bookmarks.in \
        avahi-resolve-host-name.in \
        avahi-resolve-address.in \
+       avahi-discover.in \
        avahi-discover.desktop.in
 
-if HAVE_PYTHON
-if HAVE_DBUS
 SUBDIRS=avahi
 
+if HAVE_PYTHON
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
+
+pythonscripts = \
+       avahi-publish-address \
+       avahi-publish-service \
+       avahi-bookmarks \
+       avahi-resolve-host-name \
+       avahi-resolve-address \
+       avahi-discover
+
 desktopdir = $(datadir)/applications
 desktop_DATA = avahi-discover.desktop
 
-bin_SCRIPTS = $(pythonscripts)
-
 avahi-discover.desktop: avahi-discover.desktop.in
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
        chmod +x $@
 
-avahi-publish-address: avahi-publish-address.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+avahi-discover: avahi-discover.in
+       sed -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
        chmod +x $@
 
-avahi-publish-service: avahi-publish-service.in
+avahi-publish-address: avahi-publish-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
-avahi-browse: avahi-browse.in
+avahi-publish-service: avahi-publish-service.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
-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 $@
@@ -78,7 +72,19 @@ avahi-resolve-address: avahi-resolve-address.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_browse_SOURCES = avahi-browse.c sigint.c
+avahi_browse_CFLAGS = $(AM_CFLAGS)
+avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
+endif