-avahi_discover_standalone_CFLAGS = $(AM_CFLAGS)
-avahi_discover_standalone_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+avahi_discover_standalone_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(GLADE20_CFLAGS)
+
+avahi_discover_standalone_LDADD = \
+ $(AM_LDADD) \
+ ../avahi-common/libavahi-common.la \
+ ../avahi-glib/libavahi-glib.la \
+ ../avahi-core/libavahi-core.la \
+ $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)