diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-05 13:08:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-05 13:08:47 +0000 |
commit | 45c9ba99503eaf130b3d298062c612e281893d6a (patch) | |
tree | 5b993e1fa2719a7f9fae82f29c9ebad4362d0c3b | |
parent | 40713e33b62a2cdfa5a27403c278ff5dffde4832 (diff) | |
download | gnunet-45c9ba99503eaf130b3d298062c612e281893d6a.tar.gz gnunet-45c9ba99503eaf130b3d298062c612e281893d6a.zip |
-fixes to build system, integrating conversation in non-experimental builds
-rw-r--r-- | doc/structure.dot | 3 | ||||
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 15 | ||||
-rw-r--r-- | src/conversation/test_conversation_api.c | 8 |
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; | |||
51 | mesh -> core [weight=2]; | 51 | mesh -> core [weight=2]; |
52 | mesh -> dht; | 52 | mesh -> dht; |
53 | mesh -> block [style=dotted,color=blue]; | 53 | mesh -> block [style=dotted,color=blue]; |
54 | conversation [shape=house]; | ||
55 | conversation -> mesh; | ||
56 | conversation -> gns; | ||
54 | regex -> dht; | 57 | regex -> dht; |
55 | core -> transport; | 58 | core -> transport; |
56 | topology [shape=box]; | 59 | 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 | |||
19 | $(CONSENSUS) \ | 19 | $(CONSENSUS) \ |
20 | $(EXPERIMENTATION) | 20 | $(EXPERIMENTATION) |
21 | # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment | 21 | # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment |
22 | endif | ||
23 | |||
24 | |||
22 | if HAVE_PULSE | 25 | if HAVE_PULSE |
23 | if HAVE_OPUS | 26 | if HAVE_OPUS |
24 | EXP_DIR += conversation | 27 | CONVERSATION_DIR = conversation |
25 | endif | 28 | endif |
26 | endif | 29 | endif |
27 | 30 | ||
28 | endif | ||
29 | |||
30 | if HAVE_MYSQL | 31 | if HAVE_MYSQL |
31 | MYSQL_DIR = mysql | 32 | MYSQL_DIR = mysql |
32 | endif | 33 | endif |
@@ -73,6 +74,7 @@ SUBDIRS = \ | |||
73 | namestore \ | 74 | namestore \ |
74 | vpn \ | 75 | vpn \ |
75 | gns \ | 76 | gns \ |
77 | $(CONVERSATION_DIR) \ | ||
76 | psycstore \ | 78 | psycstore \ |
77 | fs \ | 79 | fs \ |
78 | exit \ | 80 | 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) | |||
82 | gnunet_helper_audio_record_SOURCES = \ | 82 | gnunet_helper_audio_record_SOURCES = \ |
83 | gnunet-helper-audio-record.c | 83 | gnunet-helper-audio-record.c |
84 | gnunet_helper_audio_record_LDADD = \ | 84 | gnunet_helper_audio_record_LDADD = \ |
85 | -lgnunetutil \ | 85 | $(top_builddir)/src/util/libgnunetutil.la \ |
86 | -lpulse -lopus\ | 86 | -lpulse -lopus\ |
87 | $(INTLLIBS) | 87 | $(INTLLIBS) |
88 | gnunet_helper_audio_record_LDFLAGS = \ | 88 | gnunet_helper_audio_record_LDFLAGS = \ |
@@ -91,7 +91,7 @@ gnunet_helper_audio_record_LDFLAGS = \ | |||
91 | gnunet_helper_audio_playback_SOURCES = \ | 91 | gnunet_helper_audio_playback_SOURCES = \ |
92 | gnunet-helper-audio-playback.c | 92 | gnunet-helper-audio-playback.c |
93 | gnunet_helper_audio_playback_LDADD = \ | 93 | gnunet_helper_audio_playback_LDADD = \ |
94 | -lgnunetutil \ | 94 | $(top_builddir)/src/util/libgnunetutil.la \ |
95 | -lpulse -lopus\ | 95 | -lpulse -lopus\ |
96 | $(INTLLIBS) | 96 | $(INTLLIBS) |
97 | gnunet_helper_audio_playback_LDFLAGS = \ | 97 | gnunet_helper_audio_playback_LDFLAGS = \ |
@@ -100,8 +100,11 @@ gnunet_helper_audio_playback_LDFLAGS = \ | |||
100 | gnunet_service_conversation_SOURCES = \ | 100 | gnunet_service_conversation_SOURCES = \ |
101 | gnunet-service-conversation.c | 101 | gnunet-service-conversation.c |
102 | gnunet_service_conversation_LDADD = \ | 102 | gnunet_service_conversation_LDADD = \ |
103 | -lgnunetutil -lgnunetmesh -lgnunetnamestore -lgnunetgns\ | 103 | $(top_builddir)/src/gns/libgnunetgns.la \ |
104 | $(INTLLIBS) | 104 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
105 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
106 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
107 | $(INTLLIBS) | ||
105 | gnunet_service_conversation_LDFLAGS = \ | 108 | gnunet_service_conversation_LDFLAGS = \ |
106 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 109 | $(GNUNET_LDFLAGS) $(WINFLAGS) |
107 | 110 | ||
@@ -122,7 +125,7 @@ gnunet_conversation_SOURCES = \ | |||
122 | gnunet-conversation.c | 125 | gnunet-conversation.c |
123 | gnunet_conversation_LDADD = \ | 126 | gnunet_conversation_LDADD = \ |
124 | libgnunetconversation.la \ | 127 | libgnunetconversation.la \ |
125 | -lgnunetutil \ | 128 | $(top_builddir)/src/util/libgnunetutil.la \ |
126 | $(INTLLIBS) | 129 | $(INTLLIBS) |
127 | gnunet_conversation_LDFLAGS = \ | 130 | gnunet_conversation_LDFLAGS = \ |
128 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 131 | $(GNUNET_LDFLAGS) $(WINFLAGS) |
@@ -156,7 +159,7 @@ test_conversation_api_SOURCES = \ | |||
156 | test_conversation_api.c | 159 | test_conversation_api.c |
157 | test_conversation_api_LDADD = \ | 160 | test_conversation_api_LDADD = \ |
158 | libgnunetconversation.la \ | 161 | libgnunetconversation.la \ |
159 | -lgnunetutil | 162 | $(top_builddir)/src/util/libgnunetutil.la |
160 | test_conversation_api_LDFLAGS = \ | 163 | test_conversation_api_LDFLAGS = \ |
161 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | 164 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic |
162 | 165 | ||
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 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) | 3 | (C) 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -18,11 +18,11 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file src/test_conversation_api.c | 21 | * @file conversation/test_conversation_api.c |
22 | * @brief testcase for conversation_api.c | 22 | * @brief testcase for conversation_api.c |
23 | */ | 23 | */ |
24 | #include <gnunet/platform.h> | 24 | #include "platform.h" |
25 | #include <gnunet/gnunet_util_lib.h> | 25 | #include "gnunet_util_lib.h" |
26 | #include "gnunet_conversation_service.h" | 26 | #include "gnunet_conversation_service.h" |
27 | 27 | ||
28 | 28 | ||