[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29860 - in gnunet: doc src src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29860 - in gnunet: doc src src/conversation |
Date: |
Sat, 5 Oct 2013 15:08:47 +0200 |
Author: grothoff
Date: 2013-10-05 15:08:47 +0200 (Sat, 05 Oct 2013)
New Revision: 29860
Modified:
gnunet/doc/structure.dot
gnunet/src/Makefile.am
gnunet/src/conversation/Makefile.am
gnunet/src/conversation/test_conversation_api.c
Log:
-fixes to build system, integrating conversation in non-experimental builds
Modified: gnunet/doc/structure.dot
===================================================================
--- gnunet/doc/structure.dot 2013-10-05 13:00:37 UTC (rev 29859)
+++ gnunet/doc/structure.dot 2013-10-05 13:08:47 UTC (rev 29860)
@@ -51,6 +51,9 @@
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];
Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am 2013-10-05 13:00:37 UTC (rev 29859)
+++ gnunet/src/Makefile.am 2013-10-05 13:08:47 UTC (rev 29860)
@@ -19,14 +19,15 @@
$(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 @@
namestore \
vpn \
gns \
+ $(CONVERSATION_DIR) \
psycstore \
fs \
exit \
Modified: gnunet/src/conversation/Makefile.am
===================================================================
--- gnunet/src/conversation/Makefile.am 2013-10-05 13:00:37 UTC (rev 29859)
+++ gnunet/src/conversation/Makefile.am 2013-10-05 13:08:47 UTC (rev 29860)
@@ -82,7 +82,7 @@
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_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_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.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.c
test_conversation_api_LDADD = \
libgnunetconversation.la \
- -lgnunetutil
+ $(top_builddir)/src/util/libgnunetutil.la
test_conversation_api_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
Modified: gnunet/src/conversation/test_conversation_api.c
===================================================================
--- gnunet/src/conversation/test_conversation_api.c 2013-10-05 13:00:37 UTC
(rev 29859)
+++ gnunet/src/conversation/test_conversation_api.c 2013-10-05 13:08:47 UTC
(rev 29860)
@@ -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"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29860 - in gnunet: doc src src/conversation,
gnunet <=