fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-dnsconfd / Makefile.am

diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 8a0787acbd3bba23e9288460355f6be161c4ee29..4e7442996c9edbbbe7d3d704d309bf34d9cb75df 100644 (file)
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -1,7 +1,5 @@
-# $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
@@ -17,35 +15,39 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+EXTRA_DIST=avahi-dnsconfd.action avahi-dnsconfd.service.in
+
+if HAVE_XML
+if HAVE_LIBDAEMON
+
 pkgsysconfdir=$(sysconfdir)/avahi
 
 AM_CFLAGS= \
        -I$(top_srcdir) \
-       -D_GNU_SOURCE \
-       -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/dnsconf.action\" \
-       -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi/socket\" \
-       -DAVAHI_RUNTIME_DIR=\"$(localstatedir)/run\"
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
-# libdaemon
-AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
-AM_LDADD+=$(LIBDAEMON_LIBS)
+       -DAVAHI_RUNTIME_DIR=\"$(avahi_runtime_dir)/\" \
+       -DAVAHI_SOCKET=\"$(avahi_socket)\" \
+       -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/avahi-dnsconfd.action\"
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
-       avahi-dnsconfd
+sbin_PROGRAMS = avahi-dnsconfd
+
+avahi_dnsconfd_SOURCES = main.c
+avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
+avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
+
+pkgsysconf_SCRIPTS=avahi-dnsconfd.action
 
-avahi_dnsconfd_SOURCES = \
-       main.c main.h
+%.service: %.service.in
+       $(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
 
-avahi_dnsconfd_CFLAGS = $(AM_CFLAGS)
-avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = \
+       avahi-dnsconfd.service
+endif
 
-pkgsysconf_DATA=dnsconf.action
+CLEANFILES = $(systemdsystemunit_DATA)
 
-EXTRA_DIST=dnsconf.action
+endif
+endif