fix avahi_netlink_new to allow multiple netlinks per process

[catta] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b146c075b1c947bff8baf4400f0b07c2e0a0664..e28b0b721af8e3074af3e818c0ad7489a1c207b0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/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
@@ -20,24 +18,36 @@
 AM_CFLAGS= \
        -I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+if HAVE_GLIB
+if HAVE_DBUS
+if HAVE_NETLINK
 
-# DBUS
-AM_CFLAGS+=$(DBUS_CFLAGS)
-AM_LDADD+=$(DBUS_LIBS)
+if ENABLE_TESTS
+noinst_PROGRAMS = c-plus-plus-test
+endif
 
-noinst_PROGRAMS = \
-       c-plus-plus-test
+c_plus_plus_test_SOURCES = c-plus-plus-test.cc
 
-c_plus_plus_test_SOURCES = \
-       c-plus-plus-test.cc
+c_plus_plus_test_CXXFLAGS = \
+       $(AM_CFLAGS) \
+       $(GLIB20_CFLAGS) \
+       $(DBUS_CFLAGS)
 
-c_plus_plus_test_CXXFLAGS = $(AM_CFLAGS)
-c_plus_plus_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la
+c_plus_plus_test_LDADD = \
+       $(AM_LDADD) \
+       ../avahi-common/libavahi-common.la \
+       ../avahi-core/libavahi-core.la \
+       ../avahi-client/libavahi-client.la \
+       ../avahi-glib/libavahi-glib.la  \
+       $(GLIB20_LIBS) \
+       $(DBUS_LIBS)
+
+endif
+endif
+endif
 
 EXTRA_DIST=c-plus-plus-test-gen.py
 
 gen:
-       python ./c-plus-plus-test-gen.py > c-plus-plus-test.cc
+       python ./c-plus-plus-test-gen.py avahi-common avahi-core avahi-client avahi-glib > c-plus-plus-test.cc
+