8 files changed, 39 insertions, 39 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
diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c
index 63e1d52..ffac36d 100644
--- a/src/multicast/gnunet-multicast.c
+++ b/src/multicast/gnunet-multicast.c
@@ -23,8 +23,8 @@
  * @brief multicast for writing a tool
  * @author Christian Grothoff
  */
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 /* #include "gnunet_multicast_service.h" */
 
 /**
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index 18c3661..98e4665 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -23,12 +23,12 @@
  * @brief program that does multicast
  * @author Christian Grothoff
  */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_signatures.h"
-#include "gnunet_applications.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_cadet_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_signatures.h>
+#include <gnunet/gnunet_applications.h>
+#include <gnunet/gnunet_statistics_service.h>
+#include <gnunet/gnunet_cadet_service.h>
 #include "gnunet_multicast_service.h"
 #include "multicast.h"
 
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h
index 8a3ca14..c4b7ce1 100644
--- a/src/multicast/multicast.h
+++ b/src/multicast/multicast.h
@@ -27,7 +27,7 @@
 #ifndef MULTICAST_H
 #define MULTICAST_H
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_multicast_service.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index e5e8302..31d0a02 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -25,8 +25,8 @@
  * @author Gabor X Toth
  */
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_multicast_service.h"
 #include "multicast.h"
 
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index 70efdcb..b03c529 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -26,11 +26,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_multicast_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c
index ea99602..009a0a1 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -27,11 +27,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_multicast_service.h"
 
 #define NUM_PEERS 2
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index 9b44e05..95f42f4 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -26,11 +26,11 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testbed_service.h>
 #include "gnunet_multicast_service.h"
 
 #define PEERS_REQUESTED 12