diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/cli/identity/Makefile.am | 36 | ||||
-rw-r--r-- | src/cli/identity/gnunet-identity.c (renamed from src/identity/gnunet-identity.c) | 0 | ||||
-rw-r--r-- | src/contrib/service/abd/Makefile.am | 8 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 12 | ||||
-rw-r--r-- | src/fs/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/Makefile.am | 24 | ||||
-rw-r--r-- | src/messenger/Makefile.am | 4 | ||||
-rw-r--r-- | src/namecache/Makefile.am | 14 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 86 | ||||
-rw-r--r-- | src/pt/Makefile.am | 2 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 24 | ||||
-rw-r--r-- | src/rest-plugin/Makefile.am | 3 | ||||
-rw-r--r-- | src/rest-plugin/identity/Makefile.am | 26 | ||||
-rw-r--r-- | src/rest-plugin/identity/plugin_rest_identity.c (renamed from src/identity/plugin_rest_identity.c) | 2 | ||||
-rw-r--r-- | src/rest-plugin/rest/Makefile.am (renamed from src/rest/Makefile.am) | 35 | ||||
-rw-r--r-- | src/rest-plugin/rest/plugin_rest_config.c (renamed from src/rest/plugin_rest_config.c) | 0 | ||||
-rw-r--r-- | src/rest-plugin/rest/plugin_rest_copying.c (renamed from src/rest/plugin_rest_copying.c) | 0 | ||||
-rw-r--r-- | src/revocation/Makefile.am | 14 | ||||
-rw-r--r-- | src/service/Makefile.am | 4 | ||||
-rw-r--r-- | src/service/identity/.gitignore (renamed from src/identity/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/identity/Makefile.am (renamed from src/identity/Makefile.am) | 28 | ||||
-rw-r--r-- | src/service/identity/gnunet-service-identity.c (renamed from src/identity/gnunet-service-identity.c) | 0 | ||||
-rw-r--r-- | src/service/identity/identity.conf.in (renamed from src/identity/identity.conf.in) | 0 | ||||
-rw-r--r-- | src/service/identity/identity.h (renamed from src/identity/identity.h) | 0 | ||||
-rw-r--r-- | src/service/identity/identity_api.c (renamed from src/identity/identity_api.c) | 0 | ||||
-rw-r--r-- | src/service/identity/identity_api_lookup.c (renamed from src/identity/identity_api_lookup.c) | 0 | ||||
-rw-r--r-- | src/service/identity/identity_api_suffix_lookup.c (renamed from src/identity/identity_api_suffix_lookup.c) | 0 | ||||
-rw-r--r-- | src/service/identity/meson.build (renamed from src/identity/meson.build) | 0 | ||||
-rw-r--r-- | src/service/identity/test_identity.c (renamed from src/identity/test_identity.c) | 0 | ||||
-rw-r--r-- | src/service/identity/test_identity.conf (renamed from src/identity/test_identity.conf) | 0 | ||||
-rwxr-xr-x | src/service/identity/test_identity_messages.sh (renamed from src/identity/test_identity_messages.sh) | 0 | ||||
-rwxr-xr-x | src/service/identity/test_plugin_rest_identity.sh (renamed from src/identity/test_plugin_rest_identity.sh) | 0 | ||||
-rwxr-xr-x | src/service/identity/test_plugin_rest_identity_signature.sh (renamed from src/identity/test_plugin_rest_identity_signature.sh) | 0 | ||||
-rw-r--r-- | src/service/rest/.gitignore (renamed from src/rest/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/rest/Makefile.am | 42 | ||||
-rw-r--r-- | src/service/rest/gnunet-rest-server.c (renamed from src/rest/gnunet-rest-server.c) | 0 | ||||
-rw-r--r-- | src/service/rest/meson.build (renamed from src/rest/meson.build) | 0 | ||||
-rw-r--r-- | src/service/rest/rest.c (renamed from src/rest/rest.c) | 0 | ||||
-rw-r--r-- | src/service/rest/rest.conf (renamed from src/rest/rest.conf) | 0 | ||||
-rw-r--r-- | src/zonemaster/Makefile.am | 2 |
41 files changed, 210 insertions, 164 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cf40834b6..757d2c1c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -9,18 +9,15 @@ CONVERSATION_DIR = conversation | |||
9 | endif | 9 | endif |
10 | endif | 10 | endif |
11 | 11 | ||
12 | REST_DIR = rest | ||
13 | |||
14 | |||
15 | SUBDIRS = \ | 12 | SUBDIRS = \ |
16 | include $(INTLEMU_SUBDIRS) \ | 13 | include $(INTLEMU_SUBDIRS) \ |
17 | lib \ | 14 | lib \ |
18 | plugin \ | 15 | plugin \ |
19 | service \ | 16 | service \ |
17 | rest-plugin \ | ||
20 | cli \ | 18 | cli \ |
21 | contrib \ | 19 | contrib \ |
22 | statistics \ | 20 | statistics \ |
23 | $(REST_DIR) \ | ||
24 | datacache \ | 21 | datacache \ |
25 | datastore \ | 22 | datastore \ |
26 | template \ | 23 | template \ |
@@ -34,7 +31,6 @@ SUBDIRS = \ | |||
34 | topology \ | 31 | topology \ |
35 | regex \ | 32 | regex \ |
36 | dns \ | 33 | dns \ |
37 | identity \ | ||
38 | namecache \ | 34 | namecache \ |
39 | namestore \ | 35 | namestore \ |
40 | cadet \ | 36 | cadet \ |
diff --git a/src/cli/identity/Makefile.am b/src/cli/identity/Makefile.am new file mode 100644 index 000000000..be2c2f1c6 --- /dev/null +++ b/src/cli/identity/Makefile.am | |||
@@ -0,0 +1,36 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | if USE_COVERAGE | ||
7 | AM_CFLAGS = --coverage -O0 | ||
8 | XLIB = -lgcov | ||
9 | endif | ||
10 | |||
11 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
12 | |||
13 | bin_PROGRAMS = \ | ||
14 | gnunet-identity | ||
15 | |||
16 | gnunet_identity_SOURCES = \ | ||
17 | gnunet-identity.c | ||
18 | gnunet_identity_LDADD = \ | ||
19 | $(top_builddir)/src/service/libgnunetidentity.la \ | ||
20 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
21 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
22 | $(GN_LIBINTL) | ||
23 | |||
24 | check_SCRIPTS = \ | ||
25 | test_identity_messages.sh | ||
26 | |||
27 | # if ENABLE_TEST_RUN | ||
28 | # AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
29 | # TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | ||
30 | # endif | ||
31 | |||
32 | |||
33 | EXTRA_DIST = \ | ||
34 | test_identity_messages.sh | ||
35 | |||
36 | |||
diff --git a/src/identity/gnunet-identity.c b/src/cli/identity/gnunet-identity.c index 9fe4ccc51..9fe4ccc51 100644 --- a/src/identity/gnunet-identity.c +++ b/src/cli/identity/gnunet-identity.c | |||
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am index 6fa2dc848..669c00d19 100644 --- a/src/contrib/service/abd/Makefile.am +++ b/src/contrib/service/abd/Makefile.am | |||
@@ -43,7 +43,7 @@ gnunet_abd_LDADD = \ | |||
43 | libgnunetabd.la \ | 43 | libgnunetabd.la \ |
44 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 44 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
45 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 45 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
46 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 46 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
47 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 47 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
48 | $(GN_LIBINTL) | 48 | $(GN_LIBINTL) |
49 | 49 | ||
@@ -53,7 +53,7 @@ libgnunet_plugin_gnsrecord_abd_la_SOURCES = \ | |||
53 | libgnunet_plugin_gnsrecord_abd_la_LIBADD = \ | 53 | libgnunet_plugin_gnsrecord_abd_la_LIBADD = \ |
54 | libgnunetabd.la \ | 54 | libgnunetabd.la \ |
55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
56 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 56 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
57 | $(LTLIBINTL) | 57 | $(LTLIBINTL) |
58 | libgnunet_plugin_gnsrecord_abd_la_LDFLAGS = \ | 58 | libgnunet_plugin_gnsrecord_abd_la_LDFLAGS = \ |
59 | $(GN_PLUGIN_LDFLAGS) | 59 | $(GN_PLUGIN_LDFLAGS) |
@@ -67,7 +67,7 @@ gnunet_service_abd_LDADD = \ | |||
67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
68 | $(top_builddir)/src/gns/libgnunetgns.la \ | 68 | $(top_builddir)/src/gns/libgnunetgns.la \ |
69 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 69 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
70 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 70 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
71 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 71 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
72 | $(GN_LIBINTL) | 72 | $(GN_LIBINTL) |
73 | 73 | ||
@@ -80,7 +80,7 @@ libgnunetabd_la_SOURCES = \ | |||
80 | delegate_misc.h | 80 | delegate_misc.h |
81 | libgnunetabd_la_LIBADD = \ | 81 | libgnunetabd_la_LIBADD = \ |
82 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 82 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
83 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 83 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
84 | $(XLIB) | 84 | $(XLIB) |
85 | libgnunetabd_la_LDFLAGS = \ | 85 | libgnunetabd_la_LDFLAGS = \ |
86 | $(GN_LIB_LDFLAGS) | 86 | $(GN_LIB_LDFLAGS) |
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 744280af0..5aa79a0e0 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -72,7 +72,7 @@ libgnunetconversation_la_LIBADD = \ | |||
72 | $(top_builddir)/src/gns/libgnunetgns.la \ | 72 | $(top_builddir)/src/gns/libgnunetgns.la \ |
73 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 73 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
74 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 74 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
75 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 75 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
76 | $(top_builddir)/src/lib/util/libgnunetutil.la | 76 | $(top_builddir)/src/lib/util/libgnunetutil.la |
77 | 77 | ||
78 | libgnunetconversation_la_LDFLAGS = \ | 78 | libgnunetconversation_la_LDFLAGS = \ |
@@ -185,7 +185,7 @@ gnunet_service_conversation_LDADD = \ | |||
185 | libgnunetmicrophone.la \ | 185 | libgnunetmicrophone.la \ |
186 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 186 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
187 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 187 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
188 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 188 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
189 | $(INTLLIBS) | 189 | $(INTLLIBS) |
190 | #gnunet_service_conversation_LDFLAGS = \ | 190 | #gnunet_service_conversation_LDFLAGS = \ |
191 | # | 191 | # |
@@ -199,7 +199,7 @@ gnunet_conversation_LDADD = \ | |||
199 | $(top_builddir)/src/gns/libgnunetgns.la \ | 199 | $(top_builddir)/src/gns/libgnunetgns.la \ |
200 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 200 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
201 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 201 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
202 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
203 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 203 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
204 | $(INTLLIBS) | 204 | $(INTLLIBS) |
205 | #gnunet_conversation_LDFLAGS = \ | 205 | #gnunet_conversation_LDFLAGS = \ |
@@ -224,7 +224,7 @@ test_conversation_api_LDADD = \ | |||
224 | libgnunetmicrophone.la \ | 224 | libgnunetmicrophone.la \ |
225 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 225 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
226 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 226 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
227 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 227 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
228 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 228 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
229 | $(top_builddir)/src/lib/util/libgnunetutil.la | 229 | $(top_builddir)/src/lib/util/libgnunetutil.la |
230 | test_conversation_api_LDFLAGS = \ | 230 | test_conversation_api_LDFLAGS = \ |
@@ -238,7 +238,7 @@ test_conversation_api_twocalls_LDADD = \ | |||
238 | libgnunetmicrophone.la \ | 238 | libgnunetmicrophone.la \ |
239 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 239 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
240 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 240 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
241 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 241 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
242 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 242 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
243 | $(top_builddir)/src/lib/util/libgnunetutil.la | 243 | $(top_builddir)/src/lib/util/libgnunetutil.la |
244 | test_conversation_api_twocalls_LDFLAGS = \ | 244 | test_conversation_api_twocalls_LDFLAGS = \ |
@@ -252,7 +252,7 @@ test_conversation_api_reject_LDADD = \ | |||
252 | libgnunetmicrophone.la \ | 252 | libgnunetmicrophone.la \ |
253 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 253 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
254 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 254 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
255 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 255 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
256 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 256 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
257 | $(top_builddir)/src/lib/util/libgnunetutil.la | 257 | $(top_builddir)/src/lib/util/libgnunetutil.la |
258 | test_conversation_api_reject_LDFLAGS = \ | 258 | test_conversation_api_reject_LDFLAGS = \ |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index e61d2724e..b6083ea06 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -107,7 +107,7 @@ gnunet_download_LDADD = \ | |||
107 | gnunet_publish_SOURCES = \ | 107 | gnunet_publish_SOURCES = \ |
108 | gnunet-publish.c | 108 | gnunet-publish.c |
109 | gnunet_publish_LDADD = \ | 109 | gnunet_publish_LDADD = \ |
110 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 110 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
111 | libgnunetfs.la \ | 111 | libgnunetfs.la \ |
112 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 112 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
113 | $(GN_LIBINTL) | 113 | $(GN_LIBINTL) |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index e50cf4281..191103088 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -87,8 +87,8 @@ libgnunet_plugin_rest_gns_la_LIBADD = \ | |||
87 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 87 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
88 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ | 88 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ |
89 | libgnunetgns.la \ | 89 | libgnunetgns.la \ |
90 | $(top_builddir)/src/rest/libgnunetrest.la \ | 90 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
91 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 91 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
92 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | 92 | $(top_builddir)/src/lib/json/libgnunetjson.la \ |
93 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 93 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
94 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | 94 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
@@ -101,7 +101,7 @@ libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ | |||
101 | plugin_gnsrecord_gns.c | 101 | plugin_gnsrecord_gns.c |
102 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ | 102 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ |
103 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 103 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
104 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 104 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
105 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 105 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
106 | $(LTLIBINTL) | 106 | $(LTLIBINTL) |
107 | libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \ | 107 | libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \ |
@@ -113,7 +113,7 @@ gnunet_gns_SOURCES = \ | |||
113 | gnunet_gns_LDADD = \ | 113 | gnunet_gns_LDADD = \ |
114 | libgnunetgns.la \ | 114 | libgnunetgns.la \ |
115 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 115 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
116 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 116 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
117 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 117 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
118 | $(LIBIDN) $(LIBIDN2) \ | 118 | $(LIBIDN) $(LIBIDN2) \ |
119 | $(GN_LIBINTL) | 119 | $(GN_LIBINTL) |
@@ -123,7 +123,7 @@ gnunet_gns_benchmark_SOURCES = \ | |||
123 | gnunet_gns_benchmark_LDADD = \ | 123 | gnunet_gns_benchmark_LDADD = \ |
124 | libgnunetgns.la \ | 124 | libgnunetgns.la \ |
125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
126 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 126 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
127 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 127 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
128 | $(GN_LIBINTL) | 128 | $(GN_LIBINTL) |
129 | 129 | ||
@@ -132,7 +132,7 @@ gnunet_bcd_SOURCES = \ | |||
132 | gnunet-bcd.c | 132 | gnunet-bcd.c |
133 | gnunet_bcd_LDADD = \ | 133 | gnunet_bcd_LDADD = \ |
134 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 134 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
135 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 135 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
136 | $(GN_LIBINTL) $(MHD_LIBS) | 136 | $(GN_LIBINTL) $(MHD_LIBS) |
137 | gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | 137 | gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) |
138 | 138 | ||
@@ -144,7 +144,7 @@ gnunet_dns2gns_LDADD = \ | |||
144 | libgnunetgns.la \ | 144 | libgnunetgns.la \ |
145 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 145 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
146 | $(USE_VPN) \ | 146 | $(USE_VPN) \ |
147 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 147 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
148 | $(GN_LIBINTL) | 148 | $(GN_LIBINTL) |
149 | 149 | ||
150 | if HAVE_SUDO | 150 | if HAVE_SUDO |
@@ -167,7 +167,7 @@ gnunet_gns_proxy_SOURCES = \ | |||
167 | gnunet-gns-proxy.c | 167 | gnunet-gns-proxy.c |
168 | gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \ | 168 | gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \ |
169 | libgnunetgns.la \ | 169 | libgnunetgns.la \ |
170 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 170 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
171 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 171 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
172 | $(GN_LIBINTL) | 172 | $(GN_LIBINTL) |
173 | if HAVE_GNUTLS_DANE | 173 | if HAVE_GNUTLS_DANE |
@@ -185,7 +185,7 @@ test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | |||
185 | #gnunet_gns_import_SOURCES = \ | 185 | #gnunet_gns_import_SOURCES = \ |
186 | # gnunet-gns-import.c | 186 | # gnunet-gns-import.c |
187 | #gnunet_gns_import_LDADD = \ | 187 | #gnunet_gns_import_LDADD = \ |
188 | # $(top_builddir)/src/identity/libgnunetidentity.la \ | 188 | # $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
189 | # $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 189 | # $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
190 | # $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 190 | # $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
191 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 191 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -199,7 +199,7 @@ gnunet_service_gns_SOURCES = \ | |||
199 | gnunet_service_gns_LDADD = \ | 199 | gnunet_service_gns_LDADD = \ |
200 | -lm \ | 200 | -lm \ |
201 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 201 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
202 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
203 | $(top_builddir)/src/revocation/libgnunetrevocation.la \ | 203 | $(top_builddir)/src/revocation/libgnunetrevocation.la \ |
204 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 204 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -215,7 +215,7 @@ libgnunetgns_la_SOURCES = \ | |||
215 | gns_tld_api.c gns.h | 215 | gns_tld_api.c gns.h |
216 | libgnunetgns_la_LIBADD = \ | 216 | libgnunetgns_la_LIBADD = \ |
217 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \ | 217 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \ |
218 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 218 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
219 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la | 219 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la |
220 | libgnunetgns_la_LDFLAGS = \ | 220 | libgnunetgns_la_LDFLAGS = \ |
221 | $(GN_LIBINTL) \ | 221 | $(GN_LIBINTL) \ |
@@ -228,7 +228,7 @@ libgnunet_plugin_block_gns_la_LIBADD = \ | |||
228 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 228 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
229 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 229 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
230 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ | 230 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ |
231 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 231 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la | 232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la |
233 | libgnunet_plugin_block_gns_la_LDFLAGS = \ | 233 | libgnunet_plugin_block_gns_la_LDFLAGS = \ |
234 | $(GN_LIBINTL) \ | 234 | $(GN_LIBINTL) \ |
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am index a1228a7a1..d464261df 100644 --- a/src/messenger/Makefile.am +++ b/src/messenger/Makefile.am | |||
@@ -54,7 +54,7 @@ libgnunetmessenger_la_SOURCES = \ | |||
54 | libgnunetmessenger_la_LIBADD = \ | 54 | libgnunetmessenger_la_LIBADD = \ |
55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
56 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 56 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
57 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
58 | $(XLIB) \ | 58 | $(XLIB) \ |
59 | $(LTLIBINTL) | 59 | $(LTLIBINTL) |
60 | libgnunetmessenger_la_LDFLAGS = \ | 60 | libgnunetmessenger_la_LDFLAGS = \ |
@@ -94,7 +94,7 @@ gnunet_service_messenger_LDADD = \ | |||
94 | libgnunetmessenger.la \ | 94 | libgnunetmessenger.la \ |
95 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 95 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
96 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 96 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
97 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 97 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
98 | $(GN_LIBINTL) | 98 | $(GN_LIBINTL) |
99 | 99 | ||
100 | check_PROGRAMS = test_messenger_anonymous | 100 | check_PROGRAMS = test_messenger_anonymous |
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index b4a0d68f5..9be5a4fce 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am | |||
@@ -64,7 +64,7 @@ libgnunetnamecache_la_SOURCES = \ | |||
64 | namecache.h | 64 | namecache.h |
65 | libgnunetnamecache_la_LIBADD = \ | 65 | libgnunetnamecache_la_LIBADD = \ |
66 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 66 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
67 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 67 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
68 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 68 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
69 | $(GN_LIBINTL) | 69 | $(GN_LIBINTL) |
70 | libgnunetnamecache_la_LDFLAGS = \ | 70 | libgnunetnamecache_la_LDFLAGS = \ |
@@ -82,7 +82,7 @@ gnunet_namecache_SOURCES = \ | |||
82 | gnunet-namecache.c | 82 | gnunet-namecache.c |
83 | gnunet_namecache_LDADD = \ | 83 | gnunet_namecache_LDADD = \ |
84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
85 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 85 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
87 | libgnunetnamecache.la \ | 87 | libgnunetnamecache.la \ |
88 | $(GN_LIBINTL) | 88 | $(GN_LIBINTL) |
@@ -92,7 +92,7 @@ gnunet_service_namecache_SOURCES = \ | |||
92 | 92 | ||
93 | gnunet_service_namecache_LDADD = \ | 93 | gnunet_service_namecache_LDADD = \ |
94 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 94 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
95 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 95 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
96 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 96 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
97 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 97 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
98 | libgnunetnamecache.la \ | 98 | libgnunetnamecache.la \ |
@@ -110,7 +110,7 @@ libgnunet_plugin_namecache_flat_la_LIBADD = \ | |||
110 | libgnunetnamecache.la \ | 110 | libgnunetnamecache.la \ |
111 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 111 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
112 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 112 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
113 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 113 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
114 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 114 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
115 | $(LTLIBINTL) | 115 | $(LTLIBINTL) |
116 | libgnunet_plugin_namecache_flat_la_LDFLAGS = \ | 116 | libgnunet_plugin_namecache_flat_la_LDFLAGS = \ |
@@ -123,7 +123,7 @@ libgnunet_plugin_namecache_sqlite_la_LIBADD = \ | |||
123 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 123 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
124 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 124 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
126 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 126 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
127 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 127 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
128 | $(LTLIBINTL) | 128 | $(LTLIBINTL) |
129 | libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \ | 129 | libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \ |
@@ -137,7 +137,7 @@ libgnunet_plugin_namecache_postgres_la_LIBADD = \ | |||
137 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 137 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
138 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 138 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
139 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 139 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
140 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 140 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
141 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ | 141 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ |
142 | $(LTLIBINTL) | 142 | $(LTLIBINTL) |
143 | libgnunet_plugin_namecache_postgres_la_LDFLAGS = \ | 143 | libgnunet_plugin_namecache_postgres_la_LDFLAGS = \ |
@@ -147,7 +147,7 @@ test_namecache_api_cache_block_SOURCES = \ | |||
147 | test_namecache_api_cache_block.c | 147 | test_namecache_api_cache_block.c |
148 | test_namecache_api_cache_block_LDADD = \ | 148 | test_namecache_api_cache_block_LDADD = \ |
149 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 149 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
150 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 150 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
151 | libgnunetnamecache.la \ | 151 | libgnunetnamecache.la \ |
152 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 152 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
153 | $(top_builddir)/src/lib/util/libgnunetutil.la | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index c9833add5..2bdc25d56 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -108,8 +108,8 @@ libgnunet_plugin_rest_namestore_la_SOURCES = \ | |||
108 | plugin_rest_namestore.c | 108 | plugin_rest_namestore.c |
109 | libgnunet_plugin_rest_namestore_la_LIBADD = \ | 109 | libgnunet_plugin_rest_namestore_la_LIBADD = \ |
110 | libgnunetnamestore.la \ | 110 | libgnunetnamestore.la \ |
111 | $(top_builddir)/src/rest/libgnunetrest.la \ | 111 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
112 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 112 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
113 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | 113 | $(top_builddir)/src/lib/json/libgnunetjson.la \ |
114 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 114 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
115 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ | 115 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ |
@@ -126,7 +126,7 @@ libgnunetnamestore_la_SOURCES = \ | |||
126 | namestore.h | 126 | namestore.h |
127 | libgnunetnamestore_la_LIBADD = \ | 127 | libgnunetnamestore_la_LIBADD = \ |
128 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 128 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
129 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 129 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
130 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 130 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
131 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 131 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
132 | $(GN_LIBINTL) | 132 | $(GN_LIBINTL) |
@@ -138,7 +138,7 @@ gnunet_namestore_zonefile_SOURCES = \ | |||
138 | gnunet-namestore-zonefile.c | 138 | gnunet-namestore-zonefile.c |
139 | gnunet_namestore_zonefile_LDADD = \ | 139 | gnunet_namestore_zonefile_LDADD = \ |
140 | libgnunetnamestore.la \ | 140 | libgnunetnamestore.la \ |
141 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 141 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
142 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 142 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
143 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 143 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
144 | $(GN_LIBINTL) | 144 | $(GN_LIBINTL) |
@@ -148,7 +148,7 @@ gnunet_zoneimport_SOURCES = \ | |||
148 | gnunet_zoneimport_LDADD = \ | 148 | gnunet_zoneimport_LDADD = \ |
149 | libgnunetnamestore.la \ | 149 | libgnunetnamestore.la \ |
150 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 150 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
151 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 151 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
152 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 152 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
154 | $(GN_LIBINTL) | 154 | $(GN_LIBINTL) |
@@ -156,7 +156,7 @@ gnunet_zoneimport_LDADD = \ | |||
156 | gnunet_namestore_SOURCES = \ | 156 | gnunet_namestore_SOURCES = \ |
157 | gnunet-namestore.c | 157 | gnunet-namestore.c |
158 | gnunet_namestore_LDADD = \ | 158 | gnunet_namestore_LDADD = \ |
159 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 159 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
160 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 160 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
161 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 161 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
162 | libgnunetnamestore.la \ | 162 | libgnunetnamestore.la \ |
@@ -175,7 +175,7 @@ gnunet_namestore_fcfsd_SOURCES = \ | |||
175 | gnunet-namestore-fcfsd.c | 175 | gnunet-namestore-fcfsd.c |
176 | gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \ | 176 | gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \ |
177 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 177 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
178 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 178 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
179 | libgnunetnamestore.la \ | 179 | libgnunetnamestore.la \ |
180 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 180 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
181 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | 181 | $(top_builddir)/src/lib/json/libgnunetjson.la \ |
@@ -188,7 +188,7 @@ gnunet_service_namestore_SOURCES = \ | |||
188 | gnunet_service_namestore_LDADD = \ | 188 | gnunet_service_namestore_LDADD = \ |
189 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 189 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
191 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
192 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 192 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
193 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 193 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
194 | libgnunetnamestore.la \ | 194 | libgnunetnamestore.la \ |
@@ -200,7 +200,7 @@ libgnunet_plugin_namestore_sqlite_la_SOURCES = \ | |||
200 | plugin_namestore_sqlite.c | 200 | plugin_namestore_sqlite.c |
201 | libgnunet_plugin_namestore_sqlite_la_LIBADD = \ | 201 | libgnunet_plugin_namestore_sqlite_la_LIBADD = \ |
202 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 202 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
203 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 203 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
204 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 204 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
205 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 205 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
206 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 206 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
@@ -212,7 +212,7 @@ libgnunet_plugin_namestore_postgres_la_SOURCES = \ | |||
212 | plugin_namestore_postgres.c | 212 | plugin_namestore_postgres.c |
213 | libgnunet_plugin_namestore_postgres_la_LIBADD = \ | 213 | libgnunet_plugin_namestore_postgres_la_LIBADD = \ |
214 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 214 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
215 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 215 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
216 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 216 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
217 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 217 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
218 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ | 218 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ |
@@ -226,7 +226,7 @@ test_namestore_api_store_sqlite_LDADD = \ | |||
226 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 226 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
227 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 227 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
228 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 228 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
229 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 229 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
230 | libgnunetnamestore.la | 230 | libgnunetnamestore.la |
231 | 231 | ||
232 | test_namestore_api_store_postgres_SOURCES = \ | 232 | test_namestore_api_store_postgres_SOURCES = \ |
@@ -235,7 +235,7 @@ test_namestore_api_store_postgres_LDADD = \ | |||
235 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 235 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
236 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 236 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
237 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 237 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
238 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 238 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
239 | libgnunetnamestore.la | 239 | libgnunetnamestore.la |
240 | 240 | ||
241 | test_namestore_api_store_update_sqlite_SOURCES = \ | 241 | test_namestore_api_store_update_sqlite_SOURCES = \ |
@@ -243,7 +243,7 @@ test_namestore_api_store_update_sqlite_SOURCES = \ | |||
243 | test_namestore_api_store_update_sqlite_LDADD = \ | 243 | test_namestore_api_store_update_sqlite_LDADD = \ |
244 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 244 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
246 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 246 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
248 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 248 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
249 | libgnunetnamestore.la | 249 | libgnunetnamestore.la |
@@ -253,7 +253,7 @@ test_namestore_api_store_update_postgres_SOURCES = \ | |||
253 | test_namestore_api_store_update_postgres_LDADD = \ | 253 | test_namestore_api_store_update_postgres_LDADD = \ |
254 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 254 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
256 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 256 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
258 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 258 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
259 | libgnunetnamestore.la | 259 | libgnunetnamestore.la |
@@ -263,7 +263,7 @@ test_namestore_api_lookup_nick_sqlite_SOURCES = \ | |||
263 | test_namestore_api_lookup_nick_sqlite_LDADD = \ | 263 | test_namestore_api_lookup_nick_sqlite_LDADD = \ |
264 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 264 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
266 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 266 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
268 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 268 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
269 | libgnunetnamestore.la | 269 | libgnunetnamestore.la |
@@ -273,7 +273,7 @@ test_namestore_api_lookup_nick_postgres_SOURCES = \ | |||
273 | test_namestore_api_lookup_nick_postgres_LDADD = \ | 273 | test_namestore_api_lookup_nick_postgres_LDADD = \ |
274 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 274 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
276 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 276 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
278 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 278 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
279 | libgnunetnamestore.la | 279 | libgnunetnamestore.la |
@@ -281,7 +281,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \ | |||
281 | test_namestore_api_remove_sqlite_SOURCES = \ | 281 | test_namestore_api_remove_sqlite_SOURCES = \ |
282 | test_namestore_api_remove.c | 282 | test_namestore_api_remove.c |
283 | test_namestore_api_remove_sqlite_LDADD = \ | 283 | test_namestore_api_remove_sqlite_LDADD = \ |
284 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 284 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
285 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 285 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
286 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 286 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
287 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 287 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -290,7 +290,7 @@ test_namestore_api_remove_sqlite_LDADD = \ | |||
290 | test_namestore_api_remove_postgres_SOURCES = \ | 290 | test_namestore_api_remove_postgres_SOURCES = \ |
291 | test_namestore_api_remove.c | 291 | test_namestore_api_remove.c |
292 | test_namestore_api_remove_postgres_LDADD = \ | 292 | test_namestore_api_remove_postgres_LDADD = \ |
293 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 293 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
294 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 294 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
295 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 295 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
296 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 296 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -301,7 +301,7 @@ test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \ | |||
301 | test_namestore_api_remove_not_existing_record_sqlite_LDADD = \ | 301 | test_namestore_api_remove_not_existing_record_sqlite_LDADD = \ |
302 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 302 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
303 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 303 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
304 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 304 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
305 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 305 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
306 | libgnunetnamestore.la | 306 | libgnunetnamestore.la |
307 | 307 | ||
@@ -309,7 +309,7 @@ test_namestore_api_remove_not_existing_record_postgres_SOURCES = \ | |||
309 | test_namestore_api_remove_not_existing_record.c | 309 | test_namestore_api_remove_not_existing_record.c |
310 | test_namestore_api_remove_not_existing_record_postgres_LDADD = \ | 310 | test_namestore_api_remove_not_existing_record_postgres_LDADD = \ |
311 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 311 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
312 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 312 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
313 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 313 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
314 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 314 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
315 | libgnunetnamestore.la | 315 | libgnunetnamestore.la |
@@ -317,7 +317,7 @@ test_namestore_api_remove_not_existing_record_postgres_LDADD = \ | |||
317 | test_namestore_api_zone_to_name_sqlite_SOURCES = \ | 317 | test_namestore_api_zone_to_name_sqlite_SOURCES = \ |
318 | test_namestore_api_zone_to_name.c | 318 | test_namestore_api_zone_to_name.c |
319 | test_namestore_api_zone_to_name_sqlite_LDADD = \ | 319 | test_namestore_api_zone_to_name_sqlite_LDADD = \ |
320 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 320 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
321 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 321 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
322 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 322 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
323 | libgnunetnamestore.la | 323 | libgnunetnamestore.la |
@@ -325,7 +325,7 @@ test_namestore_api_zone_to_name_sqlite_LDADD = \ | |||
325 | test_namestore_api_zone_to_name_postgres_SOURCES = \ | 325 | test_namestore_api_zone_to_name_postgres_SOURCES = \ |
326 | test_namestore_api_zone_to_name.c | 326 | test_namestore_api_zone_to_name.c |
327 | test_namestore_api_zone_to_name_postgres_LDADD = \ | 327 | test_namestore_api_zone_to_name_postgres_LDADD = \ |
328 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 328 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
329 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 329 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
330 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 330 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
331 | libgnunetnamestore.la | 331 | libgnunetnamestore.la |
@@ -333,7 +333,7 @@ test_namestore_api_zone_to_name_postgres_LDADD = \ | |||
333 | test_namestore_api_monitoring_sqlite_SOURCES = \ | 333 | test_namestore_api_monitoring_sqlite_SOURCES = \ |
334 | test_namestore_api_monitoring.c | 334 | test_namestore_api_monitoring.c |
335 | test_namestore_api_monitoring_sqlite_LDADD = \ | 335 | test_namestore_api_monitoring_sqlite_LDADD = \ |
336 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 336 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
337 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 337 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
338 | libgnunetnamestore.la \ | 338 | libgnunetnamestore.la \ |
339 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 339 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -343,7 +343,7 @@ test_namestore_api_monitoring_postgres_SOURCES = \ | |||
343 | test_namestore_api_monitoring.c | 343 | test_namestore_api_monitoring.c |
344 | test_namestore_api_monitoring_postgres_LDADD = \ | 344 | test_namestore_api_monitoring_postgres_LDADD = \ |
345 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 345 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
346 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 346 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
347 | libgnunetnamestore.la \ | 347 | libgnunetnamestore.la \ |
348 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 348 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
349 | $(top_builddir)/src/lib/util/libgnunetutil.la | 349 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -352,7 +352,7 @@ test_namestore_api_monitoring_existing_sqlite_SOURCES = \ | |||
352 | test_namestore_api_monitoring_existing.c | 352 | test_namestore_api_monitoring_existing.c |
353 | test_namestore_api_monitoring_existing_sqlite_LDADD = \ | 353 | test_namestore_api_monitoring_existing_sqlite_LDADD = \ |
354 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 354 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
355 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 355 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
356 | libgnunetnamestore.la \ | 356 | libgnunetnamestore.la \ |
357 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 357 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
358 | $(top_builddir)/src/lib/util/libgnunetutil.la | 358 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -363,14 +363,14 @@ test_namestore_api_monitoring_existing_postgres_LDADD = \ | |||
363 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 363 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
364 | libgnunetnamestore.la \ | 364 | libgnunetnamestore.la \ |
365 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 365 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
366 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 366 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
367 | $(top_builddir)/src/lib/util/libgnunetutil.la | 367 | $(top_builddir)/src/lib/util/libgnunetutil.la |
368 | 368 | ||
369 | test_namestore_api_tx_rollback_sqlite_SOURCES = \ | 369 | test_namestore_api_tx_rollback_sqlite_SOURCES = \ |
370 | test_namestore_api_tx_rollback.c | 370 | test_namestore_api_tx_rollback.c |
371 | test_namestore_api_tx_rollback_sqlite_LDADD = \ | 371 | test_namestore_api_tx_rollback_sqlite_LDADD = \ |
372 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 372 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
373 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 373 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
374 | libgnunetnamestore.la \ | 374 | libgnunetnamestore.la \ |
375 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 375 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
376 | $(top_builddir)/src/lib/util/libgnunetutil.la | 376 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -379,7 +379,7 @@ test_namestore_api_tx_rollback_postgres_SOURCES = \ | |||
379 | test_namestore_api_tx_rollback.c | 379 | test_namestore_api_tx_rollback.c |
380 | test_namestore_api_tx_rollback_postgres_LDADD = \ | 380 | test_namestore_api_tx_rollback_postgres_LDADD = \ |
381 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 381 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
382 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 382 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
383 | libgnunetnamestore.la \ | 383 | libgnunetnamestore.la \ |
384 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 384 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
385 | $(top_builddir)/src/lib/util/libgnunetutil.la | 385 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -389,7 +389,7 @@ test_namestore_api_edit_records_postgres_SOURCES = \ | |||
389 | test_namestore_api_edit_records.c | 389 | test_namestore_api_edit_records.c |
390 | test_namestore_api_edit_records_postgres_LDADD = \ | 390 | test_namestore_api_edit_records_postgres_LDADD = \ |
391 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 391 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
392 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 392 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
393 | libgnunetnamestore.la \ | 393 | libgnunetnamestore.la \ |
394 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 394 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
395 | $(top_builddir)/src/lib/util/libgnunetutil.la | 395 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -399,7 +399,7 @@ test_namestore_api_zone_iteration_sqlite_SOURCES = \ | |||
399 | test_namestore_api_zone_iteration.c | 399 | test_namestore_api_zone_iteration.c |
400 | test_namestore_api_zone_iteration_sqlite_LDADD = \ | 400 | test_namestore_api_zone_iteration_sqlite_LDADD = \ |
401 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 401 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
402 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 402 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
403 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 403 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
404 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 404 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
405 | libgnunetnamestore.la | 405 | libgnunetnamestore.la |
@@ -408,7 +408,7 @@ test_namestore_api_zone_iteration_postgres_SOURCES = \ | |||
408 | test_namestore_api_zone_iteration.c | 408 | test_namestore_api_zone_iteration.c |
409 | test_namestore_api_zone_iteration_postgres_LDADD = \ | 409 | test_namestore_api_zone_iteration_postgres_LDADD = \ |
410 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 410 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
411 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 411 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
412 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 412 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
413 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 413 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
414 | libgnunetnamestore.la | 414 | libgnunetnamestore.la |
@@ -418,7 +418,7 @@ perf_namestore_api_zone_iteration_postgres_SOURCES = \ | |||
418 | perf_namestore_api_zone_iteration_postgres_LDADD = \ | 418 | perf_namestore_api_zone_iteration_postgres_LDADD = \ |
419 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 419 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
420 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 420 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
421 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 421 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
422 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 422 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
423 | libgnunetnamestore.la | 423 | libgnunetnamestore.la |
424 | 424 | ||
@@ -427,7 +427,7 @@ perf_namestore_api_import_sqlite_SOURCES = \ | |||
427 | perf_namestore_api_import_sqlite_LDADD = \ | 427 | perf_namestore_api_import_sqlite_LDADD = \ |
428 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 428 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
429 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 429 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
430 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 430 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
431 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 431 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
432 | libgnunetnamestore.la | 432 | libgnunetnamestore.la |
433 | 433 | ||
@@ -436,7 +436,7 @@ perf_namestore_api_import_postgres_SOURCES = \ | |||
436 | perf_namestore_api_import_postgres_LDADD = \ | 436 | perf_namestore_api_import_postgres_LDADD = \ |
437 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 437 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
438 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 438 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
439 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 439 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
440 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 440 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
441 | libgnunetnamestore.la | 441 | libgnunetnamestore.la |
442 | 442 | ||
@@ -445,7 +445,7 @@ perf_namestore_api_zone_iteration_sqlite_SOURCES = \ | |||
445 | perf_namestore_api_zone_iteration.c | 445 | perf_namestore_api_zone_iteration.c |
446 | perf_namestore_api_zone_iteration_sqlite_LDADD = \ | 446 | perf_namestore_api_zone_iteration_sqlite_LDADD = \ |
447 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 447 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
448 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 448 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
449 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 449 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
450 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 450 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
451 | libgnunetnamestore.la | 451 | libgnunetnamestore.la |
@@ -454,7 +454,7 @@ test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \ | |||
454 | test_namestore_api_zone_iteration_nick.c | 454 | test_namestore_api_zone_iteration_nick.c |
455 | test_namestore_api_zone_iteration_nick_sqlite_LDADD = \ | 455 | test_namestore_api_zone_iteration_nick_sqlite_LDADD = \ |
456 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 456 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
457 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 457 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
458 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 458 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
459 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 459 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
460 | libgnunetnamestore.la | 460 | libgnunetnamestore.la |
@@ -463,7 +463,7 @@ test_namestore_api_zone_iteration_nick_postgres_SOURCES = \ | |||
463 | test_namestore_api_zone_iteration_nick.c | 463 | test_namestore_api_zone_iteration_nick.c |
464 | test_namestore_api_zone_iteration_nick_postgres_LDADD = \ | 464 | test_namestore_api_zone_iteration_nick_postgres_LDADD = \ |
465 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 465 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
466 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 466 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
467 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 467 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
468 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 468 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
469 | libgnunetnamestore.la | 469 | libgnunetnamestore.la |
@@ -472,7 +472,7 @@ test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \ | |||
472 | test_namestore_api_zone_iteration_specific_zone.c | 472 | test_namestore_api_zone_iteration_specific_zone.c |
473 | test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \ | 473 | test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \ |
474 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 474 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
475 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 475 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
476 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 476 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
477 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 477 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
478 | libgnunetnamestore.la | 478 | libgnunetnamestore.la |
@@ -481,7 +481,7 @@ test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \ | |||
481 | test_namestore_api_zone_iteration_specific_zone.c | 481 | test_namestore_api_zone_iteration_specific_zone.c |
482 | test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \ | 482 | test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \ |
483 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 483 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
484 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 484 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
485 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 485 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
486 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 486 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
487 | libgnunetnamestore.la | 487 | libgnunetnamestore.la |
@@ -490,7 +490,7 @@ test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \ | |||
490 | test_namestore_api_zone_iteration_stop.c | 490 | test_namestore_api_zone_iteration_stop.c |
491 | test_namestore_api_zone_iteration_stop_sqlite_LDADD = \ | 491 | test_namestore_api_zone_iteration_stop_sqlite_LDADD = \ |
492 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 492 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
493 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 493 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
494 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 494 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
495 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 495 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
496 | libgnunetnamestore.la | 496 | libgnunetnamestore.la |
@@ -499,7 +499,7 @@ test_namestore_api_zone_iteration_stop_postgres_SOURCES = \ | |||
499 | test_namestore_api_zone_iteration_stop.c | 499 | test_namestore_api_zone_iteration_stop.c |
500 | test_namestore_api_zone_iteration_stop_postgres_LDADD = \ | 500 | test_namestore_api_zone_iteration_stop_postgres_LDADD = \ |
501 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 501 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
502 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 502 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
503 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 503 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
504 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 504 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
505 | libgnunetnamestore.la | 505 | libgnunetnamestore.la |
@@ -508,13 +508,13 @@ test_plugin_namestore_sqlite_SOURCES = \ | |||
508 | test_plugin_namestore.c | 508 | test_plugin_namestore.c |
509 | test_plugin_namestore_sqlite_LDADD = \ | 509 | test_plugin_namestore_sqlite_LDADD = \ |
510 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 510 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
511 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 511 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
512 | $(top_builddir)/src/lib/util/libgnunetutil.la | 512 | $(top_builddir)/src/lib/util/libgnunetutil.la |
513 | 513 | ||
514 | test_plugin_namestore_postgres_SOURCES = \ | 514 | test_plugin_namestore_postgres_SOURCES = \ |
515 | test_plugin_namestore.c | 515 | test_plugin_namestore.c |
516 | test_plugin_namestore_postgres_LDADD = \ | 516 | test_plugin_namestore_postgres_LDADD = \ |
517 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 517 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
518 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 518 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
519 | $(top_builddir)/src/lib/util/libgnunetutil.la | 519 | $(top_builddir)/src/lib/util/libgnunetutil.la |
520 | 520 | ||
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 80772fc1b..f00d16a5c 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -54,7 +54,7 @@ test_gns_vpn_SOURCES = \ | |||
54 | test_gns_vpn.c | 54 | test_gns_vpn.c |
55 | test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \ | 55 | test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \ |
56 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 56 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
57 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
58 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 58 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
59 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 59 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
60 | $(top_builddir)/src/lib/util/libgnunetutil.la | 60 | $(top_builddir)/src/lib/util/libgnunetutil.la |
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index a3bb58e23..e135f3534 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -58,11 +58,11 @@ libgnunet_plugin_rest_reclaim_la_SOURCES = \ | |||
58 | json_reclaim.h \ | 58 | json_reclaim.h \ |
59 | json_reclaim.c | 59 | json_reclaim.c |
60 | libgnunet_plugin_rest_reclaim_la_LIBADD = \ | 60 | libgnunet_plugin_rest_reclaim_la_LIBADD = \ |
61 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 61 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
62 | libgnunetreclaim.la \ | 62 | libgnunetreclaim.la \ |
63 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | 63 | $(top_builddir)/src/lib/json/libgnunetjson.la \ |
64 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 64 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
65 | $(top_builddir)/src/rest/libgnunetrest.la \ | 65 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
66 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 66 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
67 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 67 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
68 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | 68 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
@@ -76,9 +76,9 @@ libgnunet_plugin_rest_openid_connect_la_SOURCES = \ | |||
76 | oidc_helper.h \ | 76 | oidc_helper.h \ |
77 | oidc_helper.c | 77 | oidc_helper.c |
78 | libgnunet_plugin_rest_openid_connect_la_LIBADD = \ | 78 | libgnunet_plugin_rest_openid_connect_la_LIBADD = \ |
79 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 79 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
80 | libgnunetreclaim.la \ | 80 | libgnunetreclaim.la \ |
81 | $(top_builddir)/src/rest/libgnunetrest.la \ | 81 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
82 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 82 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
83 | $(top_builddir)/src/gns/libgnunetgns.la \ | 83 | $(top_builddir)/src/gns/libgnunetgns.la \ |
84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -97,7 +97,7 @@ libgnunet_plugin_rest_pabc_la_SOURCES = \ | |||
97 | libgnunet_plugin_rest_pabc_la_LIBADD = \ | 97 | libgnunet_plugin_rest_pabc_la_LIBADD = \ |
98 | libgnunetreclaim.la \ | 98 | libgnunetreclaim.la \ |
99 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | 99 | $(top_builddir)/src/lib/json/libgnunetjson.la \ |
100 | $(top_builddir)/src/rest/libgnunetrest.la \ | 100 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
101 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 101 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
102 | $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS) | 102 | $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS) |
103 | libgnunet_plugin_rest_pabc_la_LDFLAGS = \ | 103 | libgnunet_plugin_rest_pabc_la_LDFLAGS = \ |
@@ -121,7 +121,7 @@ gnunet_service_reclaim_SOURCES = \ | |||
121 | gnunet-service-reclaim_tickets.h | 121 | gnunet-service-reclaim_tickets.h |
122 | gnunet_service_reclaim_LDADD = \ | 122 | gnunet_service_reclaim_LDADD = \ |
123 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 123 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
124 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 124 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
125 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 125 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
126 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 126 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
127 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 127 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -138,7 +138,7 @@ libgnunetreclaim_la_SOURCES = \ | |||
138 | reclaim_credential.h | 138 | reclaim_credential.h |
139 | libgnunetreclaim_la_LIBADD = \ | 139 | libgnunetreclaim_la_LIBADD = \ |
140 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 140 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
141 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 141 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
142 | $(GN_LIBINTL) $(XLIB) | 142 | $(GN_LIBINTL) $(XLIB) |
143 | libgnunetreclaim_la_LDFLAGS = \ | 143 | libgnunetreclaim_la_LDFLAGS = \ |
144 | $(GN_LIB_LDFLAGS) \ | 144 | $(GN_LIB_LDFLAGS) \ |
@@ -153,7 +153,7 @@ libgnunetdid_la_LIBADD = \ | |||
153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
154 | $(top_builddir)/src/gns/libgnunetgns.la \ | 154 | $(top_builddir)/src/gns/libgnunetgns.la \ |
155 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 155 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
156 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 156 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
157 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 157 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
158 | -ljansson \ | 158 | -ljansson \ |
159 | $(GN_LIBINTL) $(XLIB) | 159 | $(GN_LIBINTL) $(XLIB) |
@@ -188,7 +188,7 @@ endif | |||
188 | libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \ | 188 | libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \ |
189 | plugin_reclaim_credential_jwt.c | 189 | plugin_reclaim_credential_jwt.c |
190 | libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \ | 190 | libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \ |
191 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
192 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 192 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
193 | libgnunetreclaim.la \ | 193 | libgnunetreclaim.la \ |
194 | -ljansson\ | 194 | -ljansson\ |
@@ -202,7 +202,7 @@ gnunet_reclaim_LDADD = \ | |||
202 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 202 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
203 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 203 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
204 | libgnunetreclaim.la \ | 204 | libgnunetreclaim.la \ |
205 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 205 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
206 | $(GN_LIBINTL) | 206 | $(GN_LIBINTL) |
207 | 207 | ||
208 | test_reclaim_attribute_SOURCES = \ | 208 | test_reclaim_attribute_SOURCES = \ |
@@ -218,7 +218,7 @@ gnunet_did_LDADD = \ | |||
218 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 218 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
219 | $(top_builddir)/src/gns/libgnunetgns.la \ | 219 | $(top_builddir)/src/gns/libgnunetgns.la \ |
220 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 220 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
221 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 221 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
222 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 222 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
223 | libgnunetdid.la \ | 223 | libgnunetdid.la \ |
224 | -ljansson | 224 | -ljansson |
@@ -230,7 +230,7 @@ test_did_helper_LDADD = \ | |||
230 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 230 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
231 | $(top_builddir)/src/gns/libgnunetgns.la \ | 231 | $(top_builddir)/src/gns/libgnunetgns.la \ |
232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
233 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 233 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
234 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 234 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
235 | libgnunetdid.la \ | 235 | libgnunetdid.la \ |
236 | -ljansson | 236 | -ljansson |
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am new file mode 100644 index 000000000..fb74b9f2e --- /dev/null +++ b/src/rest-plugin/Makefile.am | |||
@@ -0,0 +1,3 @@ | |||
1 | SUBDIRS = \ | ||
2 | rest \ | ||
3 | identity | ||
diff --git a/src/rest-plugin/identity/Makefile.am b/src/rest-plugin/identity/Makefile.am new file mode 100644 index 000000000..bcad0c2dd --- /dev/null +++ b/src/rest-plugin/identity/Makefile.am | |||
@@ -0,0 +1,26 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | if USE_COVERAGE | ||
7 | AM_CFLAGS = --coverage -O0 | ||
8 | XLIB = -lgcov | ||
9 | endif | ||
10 | |||
11 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la | ||
12 | |||
13 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
14 | |||
15 | libexecdir= $(pkglibdir)/libexec/ | ||
16 | |||
17 | libgnunet_plugin_rest_identity_la_SOURCES = \ | ||
18 | plugin_rest_identity.c | ||
19 | libgnunet_plugin_rest_identity_la_LIBADD = \ | ||
20 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
21 | $(top_builddir)/src/service/rest/libgnunetrest.la \ | ||
22 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | ||
23 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | ||
24 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ | ||
25 | $(GN_PLUGIN_LDFLAGS) | ||
26 | libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
diff --git a/src/identity/plugin_rest_identity.c b/src/rest-plugin/identity/plugin_rest_identity.c index cae0e4d95..e7b7f8a9c 100644 --- a/src/identity/plugin_rest_identity.c +++ b/src/rest-plugin/identity/plugin_rest_identity.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "gnunet_rest_plugin.h" | 28 | #include "gnunet_rest_plugin.h" |
29 | #include "gnunet_identity_service.h" | 29 | #include "gnunet_identity_service.h" |
30 | #include "gnunet_rest_lib.h" | 30 | #include "gnunet_rest_lib.h" |
31 | #include "identity.h" | 31 | #include "../../service/identity/identity.h" |
32 | #include "gnunet_util_lib.h" | 32 | #include "gnunet_util_lib.h" |
33 | #include "microhttpd.h" | 33 | #include "microhttpd.h" |
34 | #include <jansson.h> | 34 | #include <jansson.h> |
diff --git a/src/rest/Makefile.am b/src/rest-plugin/rest/Makefile.am index e3952a45e..4f7f834fb 100644 --- a/src/rest/Makefile.am +++ b/src/rest-plugin/rest/Makefile.am | |||
@@ -7,31 +7,19 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
7 | 7 | ||
8 | libexecdir= $(pkglibdir)/libexec/ | 8 | libexecdir= $(pkglibdir)/libexec/ |
9 | 9 | ||
10 | pkgcfg_DATA = \ | ||
11 | rest.conf | ||
12 | |||
13 | if USE_COVERAGE | 10 | if USE_COVERAGE |
14 | AM_CFLAGS = --coverage -O0 | 11 | AM_CFLAGS = --coverage -O0 |
15 | XLIBS = -lgcov | 12 | XLIBS = -lgcov |
16 | endif | 13 | endif |
17 | 14 | ||
18 | lib_LTLIBRARIES = \ | ||
19 | libgnunetrest.la | ||
20 | |||
21 | libexec_PROGRAMS = \ | ||
22 | gnunet-rest-server | ||
23 | |||
24 | plugin_LTLIBRARIES = \ | 15 | plugin_LTLIBRARIES = \ |
25 | libgnunet_plugin_rest_copying.la \ | 16 | libgnunet_plugin_rest_copying.la \ |
26 | libgnunet_plugin_rest_config.la | 17 | libgnunet_plugin_rest_config.la |
27 | 18 | ||
28 | EXTRA_DIST = \ | ||
29 | rest.conf | ||
30 | |||
31 | libgnunet_plugin_rest_copying_la_SOURCES = \ | 19 | libgnunet_plugin_rest_copying_la_SOURCES = \ |
32 | plugin_rest_copying.c | 20 | plugin_rest_copying.c |
33 | libgnunet_plugin_rest_copying_la_LIBADD = \ | 21 | libgnunet_plugin_rest_copying_la_LIBADD = \ |
34 | libgnunetrest.la \ | 22 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
35 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 23 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
36 | $(LTLIBINTL) $(MHD_LIBS) | 24 | $(LTLIBINTL) $(MHD_LIBS) |
37 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ | 25 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ |
@@ -41,28 +29,9 @@ libgnunet_plugin_rest_copying_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | |||
41 | libgnunet_plugin_rest_config_la_SOURCES = \ | 29 | libgnunet_plugin_rest_config_la_SOURCES = \ |
42 | plugin_rest_config.c | 30 | plugin_rest_config.c |
43 | libgnunet_plugin_rest_config_la_LIBADD = \ | 31 | libgnunet_plugin_rest_config_la_LIBADD = \ |
44 | libgnunetrest.la \ | 32 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
45 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 33 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
46 | $(LTLIBINTL) $(MHD_LIBS) -ljansson | 34 | $(LTLIBINTL) $(MHD_LIBS) -ljansson |
47 | libgnunet_plugin_rest_config_la_LDFLAGS = \ | 35 | libgnunet_plugin_rest_config_la_LDFLAGS = \ |
48 | $(GN_PLUGIN_LDFLAGS) | 36 | $(GN_PLUGIN_LDFLAGS) |
49 | libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | 37 | libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) |
50 | |||
51 | |||
52 | |||
53 | gnunet_rest_server_SOURCES = \ | ||
54 | gnunet-rest-server.c | ||
55 | gnunet_rest_server_LDADD = \ | ||
56 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
57 | $(GN_LIBINTL) $(MHD_LIBS) | ||
58 | gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
59 | |||
60 | libgnunetrest_la_SOURCES = \ | ||
61 | rest.c | ||
62 | libgnunetrest_la_LIBADD = \ | ||
63 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \ | ||
64 | $(GN_LIBINTL) $(MHD_LIBS) | ||
65 | libgnunetrest_la_LDFLAGS = \ | ||
66 | $(GN_LIB_LDFLAGS) \ | ||
67 | -version-info 0:0:0 | ||
68 | libgnunetrest_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
diff --git a/src/rest/plugin_rest_config.c b/src/rest-plugin/rest/plugin_rest_config.c index 826188702..826188702 100644 --- a/src/rest/plugin_rest_config.c +++ b/src/rest-plugin/rest/plugin_rest_config.c | |||
diff --git a/src/rest/plugin_rest_copying.c b/src/rest-plugin/rest/plugin_rest_copying.c index 52783a81a..52783a81a 100644 --- a/src/rest/plugin_rest_copying.c +++ b/src/rest-plugin/rest/plugin_rest_copying.c | |||
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index 631ebbf95..d271298a8 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am | |||
@@ -28,7 +28,7 @@ libgnunet_plugin_block_revocation_la_LIBADD = \ | |||
28 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ | 28 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ |
29 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 29 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
31 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 31 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
32 | $(LTLIBINTL) | 32 | $(LTLIBINTL) |
33 | libgnunet_plugin_block_revocation_la_LDFLAGS = \ | 33 | libgnunet_plugin_block_revocation_la_LDFLAGS = \ |
34 | $(GN_PLUGIN_LDFLAGS) | 34 | $(GN_PLUGIN_LDFLAGS) |
@@ -38,7 +38,7 @@ gnunet_revocation_SOURCES = \ | |||
38 | gnunet-revocation.c | 38 | gnunet-revocation.c |
39 | gnunet_revocation_LDADD = \ | 39 | gnunet_revocation_LDADD = \ |
40 | libgnunetrevocation.la \ | 40 | libgnunetrevocation.la \ |
41 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 41 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
42 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 42 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
43 | $(GN_LIBINTL) | 43 | $(GN_LIBINTL) |
44 | 44 | ||
@@ -46,7 +46,7 @@ gnunet_revocation_tvg_SOURCES = \ | |||
46 | gnunet-revocation-tvg.c | 46 | gnunet-revocation-tvg.c |
47 | gnunet_revocation_tvg_LDADD = \ | 47 | gnunet_revocation_tvg_LDADD = \ |
48 | libgnunetrevocation.la \ | 48 | libgnunetrevocation.la \ |
49 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 49 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
50 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 50 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
51 | $(GN_LIBINTL) | 51 | $(GN_LIBINTL) |
52 | 52 | ||
@@ -54,7 +54,7 @@ test_revocation_lsd0001testvectors_SOURCES = \ | |||
54 | test_revocation_testvectors.c | 54 | test_revocation_testvectors.c |
55 | test_revocation_lsd0001testvectors_LDADD = \ | 55 | test_revocation_lsd0001testvectors_LDADD = \ |
56 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 56 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ |
57 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
58 | libgnunetrevocation.la \ | 58 | libgnunetrevocation.la \ |
59 | $(top_builddir)/src/lib/util/libgnunetutil.la | 59 | $(top_builddir)/src/lib/util/libgnunetutil.la |
60 | 60 | ||
@@ -64,7 +64,7 @@ libgnunetrevocation_la_SOURCES = \ | |||
64 | revocation_api.c revocation.h | 64 | revocation_api.c revocation.h |
65 | libgnunetrevocation_la_LIBADD = \ | 65 | libgnunetrevocation_la_LIBADD = \ |
66 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 66 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
67 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 67 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
68 | $(LIBGCRYPT_LIBS) \ | 68 | $(LIBGCRYPT_LIBS) \ |
69 | $(GN_LIBINTL) $(XLIB) -lgcrypt | 69 | $(GN_LIBINTL) $(XLIB) -lgcrypt |
70 | libgnunetrevocation_la_LDFLAGS = \ | 70 | libgnunetrevocation_la_LDFLAGS = \ |
@@ -84,7 +84,7 @@ gnunet_service_revocation_LDADD = \ | |||
84 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 84 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
85 | $(top_builddir)/src/setu/libgnunetsetu.la \ | 85 | $(top_builddir)/src/setu/libgnunetsetu.la \ |
86 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 86 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
87 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 87 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
88 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 88 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
89 | -lm \ | 89 | -lm \ |
90 | $(GN_LIBINTL) | 90 | $(GN_LIBINTL) |
@@ -92,7 +92,7 @@ gnunet_service_revocation_LDADD = \ | |||
92 | test_revocation_SOURCES = \ | 92 | test_revocation_SOURCES = \ |
93 | test_revocation.c | 93 | test_revocation.c |
94 | test_revocation_LDADD = \ | 94 | test_revocation_LDADD = \ |
95 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 95 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
96 | libgnunetrevocation.la \ | 96 | libgnunetrevocation.la \ |
97 | $(top_builddir)/src//core/libgnunetcore.la \ | 97 | $(top_builddir)/src//core/libgnunetcore.la \ |
98 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 98 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
diff --git a/src/service/Makefile.am b/src/service/Makefile.am index 218e68671..737a4fd4d 100644 --- a/src/service/Makefile.am +++ b/src/service/Makefile.am | |||
@@ -1,4 +1,6 @@ | |||
1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
2 | util \ | 2 | util \ |
3 | arm \ | 3 | arm \ |
4 | core | 4 | core \ |
5 | identity \ | ||
6 | rest | ||
diff --git a/src/identity/.gitignore b/src/service/identity/.gitignore index 634a0bdd6..634a0bdd6 100644 --- a/src/identity/.gitignore +++ b/src/service/identity/.gitignore | |||
diff --git a/src/identity/Makefile.am b/src/service/identity/Makefile.am index bf430ed77..079a9af2e 100644 --- a/src/identity/Makefile.am +++ b/src/service/identity/Makefile.am | |||
@@ -8,8 +8,6 @@ if USE_COVERAGE | |||
8 | XLIB = -lgcov | 8 | XLIB = -lgcov |
9 | endif | 9 | endif |
10 | 10 | ||
11 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la | ||
12 | |||
13 | pkgcfgdir= $(pkgdatadir)/config.d/ | 11 | pkgcfgdir= $(pkgdatadir)/config.d/ |
14 | 12 | ||
15 | libexecdir= $(pkglibdir)/libexec/ | 13 | libexecdir= $(pkglibdir)/libexec/ |
@@ -21,18 +19,6 @@ lib_LTLIBRARIES = \ | |||
21 | libgnunetidentity.la | 19 | libgnunetidentity.la |
22 | 20 | ||
23 | 21 | ||
24 | libgnunet_plugin_rest_identity_la_SOURCES = \ | ||
25 | plugin_rest_identity.c | ||
26 | libgnunet_plugin_rest_identity_la_LIBADD = \ | ||
27 | libgnunetidentity.la \ | ||
28 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
29 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | ||
30 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | ||
31 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ | ||
32 | $(GN_PLUGIN_LDFLAGS) | ||
33 | libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
34 | |||
35 | |||
36 | libgnunetidentity_la_SOURCES = \ | 22 | libgnunetidentity_la_SOURCES = \ |
37 | identity_api.c \ | 23 | identity_api.c \ |
38 | identity_api_lookup.c \ | 24 | identity_api_lookup.c \ |
@@ -46,9 +32,6 @@ libgnunetidentity_la_LDFLAGS = \ | |||
46 | -lsodium \ | 32 | -lsodium \ |
47 | -version-info 1:0:0 | 33 | -version-info 1:0:0 |
48 | 34 | ||
49 | bin_PROGRAMS = \ | ||
50 | gnunet-identity | ||
51 | |||
52 | libexec_PROGRAMS = \ | 35 | libexec_PROGRAMS = \ |
53 | gnunet-service-identity | 36 | gnunet-service-identity |
54 | 37 | ||
@@ -61,20 +44,9 @@ gnunet_service_identity_LDADD = \ | |||
61 | $(GN_LIBINTL) | 44 | $(GN_LIBINTL) |
62 | 45 | ||
63 | 46 | ||
64 | gnunet_identity_SOURCES = \ | ||
65 | gnunet-identity.c | ||
66 | gnunet_identity_LDADD = \ | ||
67 | libgnunetidentity.la \ | ||
68 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
69 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
70 | $(GN_LIBINTL) | ||
71 | |||
72 | check_PROGRAMS = \ | 47 | check_PROGRAMS = \ |
73 | test_identity | 48 | test_identity |
74 | 49 | ||
75 | check_SCRIPTS = \ | ||
76 | test_identity_messages.sh | ||
77 | |||
78 | # if ENABLE_TEST_RUN | 50 | # if ENABLE_TEST_RUN |
79 | # AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 51 | # AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
80 | # TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 52 | # TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
diff --git a/src/identity/gnunet-service-identity.c b/src/service/identity/gnunet-service-identity.c index 7ac4bf2b9..7ac4bf2b9 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/service/identity/gnunet-service-identity.c | |||
diff --git a/src/identity/identity.conf.in b/src/service/identity/identity.conf.in index f5d454323..f5d454323 100644 --- a/src/identity/identity.conf.in +++ b/src/service/identity/identity.conf.in | |||
diff --git a/src/identity/identity.h b/src/service/identity/identity.h index acb403736..acb403736 100644 --- a/src/identity/identity.h +++ b/src/service/identity/identity.h | |||
diff --git a/src/identity/identity_api.c b/src/service/identity/identity_api.c index fe789d643..fe789d643 100644 --- a/src/identity/identity_api.c +++ b/src/service/identity/identity_api.c | |||
diff --git a/src/identity/identity_api_lookup.c b/src/service/identity/identity_api_lookup.c index 03b229e08..03b229e08 100644 --- a/src/identity/identity_api_lookup.c +++ b/src/service/identity/identity_api_lookup.c | |||
diff --git a/src/identity/identity_api_suffix_lookup.c b/src/service/identity/identity_api_suffix_lookup.c index 7bc0d18f3..7bc0d18f3 100644 --- a/src/identity/identity_api_suffix_lookup.c +++ b/src/service/identity/identity_api_suffix_lookup.c | |||
diff --git a/src/identity/meson.build b/src/service/identity/meson.build index c9e4f9bb4..c9e4f9bb4 100644 --- a/src/identity/meson.build +++ b/src/service/identity/meson.build | |||
diff --git a/src/identity/test_identity.c b/src/service/identity/test_identity.c index d133e3ee4..d133e3ee4 100644 --- a/src/identity/test_identity.c +++ b/src/service/identity/test_identity.c | |||
diff --git a/src/identity/test_identity.conf b/src/service/identity/test_identity.conf index 14b915732..14b915732 100644 --- a/src/identity/test_identity.conf +++ b/src/service/identity/test_identity.conf | |||
diff --git a/src/identity/test_identity_messages.sh b/src/service/identity/test_identity_messages.sh index edb4d5805..edb4d5805 100755 --- a/src/identity/test_identity_messages.sh +++ b/src/service/identity/test_identity_messages.sh | |||
diff --git a/src/identity/test_plugin_rest_identity.sh b/src/service/identity/test_plugin_rest_identity.sh index a5879dd7e..a5879dd7e 100755 --- a/src/identity/test_plugin_rest_identity.sh +++ b/src/service/identity/test_plugin_rest_identity.sh | |||
diff --git a/src/identity/test_plugin_rest_identity_signature.sh b/src/service/identity/test_plugin_rest_identity_signature.sh index a4d5fa5d7..a4d5fa5d7 100755 --- a/src/identity/test_plugin_rest_identity_signature.sh +++ b/src/service/identity/test_plugin_rest_identity_signature.sh | |||
diff --git a/src/rest/.gitignore b/src/service/rest/.gitignore index 07e69218e..07e69218e 100644 --- a/src/rest/.gitignore +++ b/src/service/rest/.gitignore | |||
diff --git a/src/service/rest/Makefile.am b/src/service/rest/Makefile.am new file mode 100644 index 000000000..401be36f4 --- /dev/null +++ b/src/service/rest/Makefile.am | |||
@@ -0,0 +1,42 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
7 | |||
8 | libexecdir= $(pkglibdir)/libexec/ | ||
9 | |||
10 | pkgcfg_DATA = \ | ||
11 | rest.conf | ||
12 | |||
13 | if USE_COVERAGE | ||
14 | AM_CFLAGS = --coverage -O0 | ||
15 | XLIBS = -lgcov | ||
16 | endif | ||
17 | |||
18 | lib_LTLIBRARIES = \ | ||
19 | libgnunetrest.la | ||
20 | |||
21 | libexec_PROGRAMS = \ | ||
22 | gnunet-rest-server | ||
23 | |||
24 | EXTRA_DIST = \ | ||
25 | rest.conf | ||
26 | |||
27 | gnunet_rest_server_SOURCES = \ | ||
28 | gnunet-rest-server.c | ||
29 | gnunet_rest_server_LDADD = \ | ||
30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
31 | $(GN_LIBINTL) $(MHD_LIBS) | ||
32 | gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
33 | |||
34 | libgnunetrest_la_SOURCES = \ | ||
35 | rest.c | ||
36 | libgnunetrest_la_LIBADD = \ | ||
37 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \ | ||
38 | $(GN_LIBINTL) $(MHD_LIBS) | ||
39 | libgnunetrest_la_LDFLAGS = \ | ||
40 | $(GN_LIB_LDFLAGS) \ | ||
41 | -version-info 0:0:0 | ||
42 | libgnunetrest_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
diff --git a/src/rest/gnunet-rest-server.c b/src/service/rest/gnunet-rest-server.c index 5163c2271..5163c2271 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/service/rest/gnunet-rest-server.c | |||
diff --git a/src/rest/meson.build b/src/service/rest/meson.build index 2dd3d8de4..2dd3d8de4 100644 --- a/src/rest/meson.build +++ b/src/service/rest/meson.build | |||
diff --git a/src/rest/rest.c b/src/service/rest/rest.c index 757c0b979..757c0b979 100644 --- a/src/rest/rest.c +++ b/src/service/rest/rest.c | |||
diff --git a/src/rest/rest.conf b/src/service/rest/rest.conf index 85c006c9b..85c006c9b 100644 --- a/src/rest/rest.conf +++ b/src/service/rest/rest.conf | |||
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am index 3a3b150e2..b5fcb9d7b 100644 --- a/src/zonemaster/Makefile.am +++ b/src/zonemaster/Makefile.am | |||
@@ -23,7 +23,7 @@ gnunet_service_zonemaster_SOURCES = \ | |||
23 | gnunet_service_zonemaster_LDADD = \ | 23 | gnunet_service_zonemaster_LDADD = \ |
24 | $(top_builddir)/src/dht/libgnunetdht.la \ | 24 | $(top_builddir)/src/dht/libgnunetdht.la \ |
25 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 25 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
26 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 26 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
27 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 27 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |