4 files changed, 21 insertions, 13 deletions

diff --git a/doc/structure.dot b/doc/structure.dot
index acf3ce7d1..0ceca2c4d 100644
--- a/doc/structure.dot
+++ b/doc/structure.dot
@@ -51,6 +51,9 @@ splines = true;
   mesh -> core [weight=2];
   mesh -> dht;
   mesh -> block [style=dotted,color=blue];
+  conversation [shape=house];
+  conversation -> mesh;
+  conversation -> gns;
   regex -> dht;
   core -> transport;
   topology [shape=box];
diff --git a/src/Makefile.am b/src/Makefile.am
index 97b643f5c..a43f1b865 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,14 +19,15 @@ if HAVE_EXPERIMENTAL
   $(CONSENSUS) \
   $(EXPERIMENTATION)
   # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+endif
+
+
 if HAVE_PULSE
 if HAVE_OPUS
-  EXP_DIR += conversation
+  CONVERSATION_DIR = conversation
 endif
 endif
 
-endif
-
 if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
@@ -73,6 +74,7 @@ SUBDIRS = \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
   psycstore \
   fs \
   exit \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index d336d93e6..46d36053e 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -82,7 +82,7 @@ TESTS = $(check_PROGRAMS)
 gnunet_helper_audio_record_SOURCES = \
   gnunet-helper-audio-record.c
 gnunet_helper_audio_record_LDADD = \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   -lpulse  -lopus\
   $(INTLLIBS) 
 gnunet_helper_audio_record_LDFLAGS = \
@@ -91,7 +91,7 @@ gnunet_helper_audio_record_LDFLAGS = \
 gnunet_helper_audio_playback_SOURCES = \
   gnunet-helper-audio-playback.c
 gnunet_helper_audio_playback_LDADD = \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   -lpulse -lopus\
   $(INTLLIBS) 
 gnunet_helper_audio_playback_LDFLAGS = \
@@ -100,8 +100,11 @@ gnunet_helper_audio_playback_LDFLAGS = \
 gnunet_service_conversation_SOURCES = \
   gnunet-service-conversation.c
 gnunet_service_conversation_LDADD = \
-  -lgnunetutil -lgnunetmesh -lgnunetnamestore -lgnunetgns\
-    $(INTLLIBS) 
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(INTLLIBS) 
 gnunet_service_conversation_LDFLAGS = \
   $(GNUNET_LDFLAGS)  $(WINFLAGS) 
 
@@ -122,7 +125,7 @@ gnunet_conversation_SOURCES = \
   gnunet-conversation.c
 gnunet_conversation_LDADD = \
   libgnunetconversation.la \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(INTLLIBS) 
 gnunet_conversation_LDFLAGS = \
  $(GNUNET_LDFLAGS) $(WINFLAGS) 
@@ -156,7 +159,7 @@ test_conversation_api_SOURCES = \
  test_conversation_api.c
 test_conversation_api_LDADD = \
   libgnunetconversation.la \
-  -lgnunetutil
+  $(top_builddir)/src/util/libgnunetutil.la 
 test_conversation_api_LDFLAGS = \
  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
 
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index e9f829f24..af2ff75e4 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C)
+     (C) 2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -18,11 +18,11 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/test_conversation_api.c
+ * @file conversation/test_conversation_api.c
  * @brief testcase for conversation_api.c
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_conversation_service.h"