Modify C++ testing code to pass when CXXFLAGS contains -Werror. (Closes #75) (BTW...

[catta] / avahi-autoipd / Makefile.am

diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
index 2483851932bc16493eba0f731668c821cf99efc7..11e6493b17fc499260eee800aef56035c8cadb7c 100644 (file)
--- a/avahi-autoipd/Makefile.am
+++ b/avahi-autoipd/Makefile.am
@@ -33,11 +33,49 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' \
 
 sbin_PROGRAMS = avahi-autoipd
 
-avahi_autoipd_SOURCES = main.c  ../avahi-daemon/setproctitle.c iface.h main.h iface-linux.c
+avahi_autoipd_SOURCES = \
+       main.c main.h \
+        ../avahi-daemon/setproctitle.c  ../avahi-daemon/setproctitle.h \
+       iface.h iface-linux.c \
+       ../avahi-common/malloc.h ../avahi-common/malloc.c \
+       ../avahi-common/timeval.h ../avahi-common/timeval.c
+
 avahi_autoipd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
-avahi_autoipd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
+avahi_autoipd_LDADD = $(AM_LDADD) $(LIBDAEMON_LIBS)
 
 pkgsysconf_SCRIPTS=avahi-autoipd.action
 
+if TARGET_DEBIAN
+
+noinst_SCRIPTS = dhclient-enter-hook dhclient-exit-hook
+
+dhclient-enter-hook: dhclient-enter-hook.in
+       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       chmod +x $@
+
+dhclient-exit-hook: dhclient-exit-hook.in
+       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       chmod +x $@
+
+BUILD = dhclient-exit-hook dhclient-enter-hook
+
+dhcliententerdir = $(sysconfdir)/dhcp3/dhclient-enter-hooks.d
+dhclientexitdir = $(sysconfdir)/dhcp3/dhclient-exit-hooks.d
+
+install-exec-hook: dhclient-exit-hook dhclient-enter-hook
+       $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+       $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
+       $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
+
+uninstall-hook:
+       rm -f $(DESTDIR)$(dhcliententerdir)/avahi-autoipd $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
+
 endif
+
+
 endif
+endif
+
+EXTRA_DIST=avahi-autoipd.action dhclient-enter-hook.in dhclient-exit-hook.in
+
+CLEANFILES=dhclient-enter-hook dhclient-exit-hook