fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-python / Makefile.am

diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am
index 7f4980ab3cca31dd90f5709f59493dfaffc16573..7381a48b55b61b81c0539a3c277d42ac4e8a3718 100644 (file)
--- a/avahi-python/Makefile.am
+++ b/avahi-python/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -23,39 +21,22 @@ 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
-if HAVE_PYGTK
 
 pythonscripts = \
-       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-bookmarks
 
 avahi-bookmarks: avahi-bookmarks.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+       $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ && \
        chmod +x $@
 
 bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
+CLEANFILES = $(pythonscripts)
 
 endif
 endif
-endif