1 files changed, 13 insertions, 13 deletions

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 61a9f8b..0650199 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -1,6 +1,6 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/src/include \
+  $(GNUNET_CPPFLAGS)
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libgnunetmulticast.la
 libgnunetmulticast_la_SOURCES = \
   multicast_api.c multicast.h
 libgnunetmulticast_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)
 libgnunetmulticast_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -38,15 +38,15 @@ libexec_PROGRAMS = \
 gnunet_multicast_SOURCES = \
  gnunet-multicast.c
 gnunet_multicast_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL)
 
 gnunet_service_multicast_SOURCES = \
  gnunet-service-multicast.c
 gnunet_service_multicast_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgnunetutil \
+  -lgnunetcadet \
+  -lgnunetstatistics \
   $(GN_LIBINTL)
 
 check_PROGRAMS = \
@@ -63,17 +63,17 @@ test_multicast_SOURCES = \
  test_multicast.c
 test_multicast_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 test_multicast_multipeer_star_SOURCES = \
   test_multicast_multipeer.c
 test_multicast_multipeer_star_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettestbed \
+  -lgnunetutil
 test_multicast_multipeer_line_SOURCES = \
   test_multicast_multipeer.c
 test_multicast_multipeer_line_LDADD = \
   libgnunetmulticast.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettestbed \
+  -lgnunetutil