-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_CXXFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB20_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+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