diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:41:59 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-03-12 09:41:59 +0100 |
commit | a649dcbd9b204c7ec807d711e4c1bf7cb2edf5ae (patch) | |
tree | 125d5454b6a0a97b46ba9e4c6344a72e14c250eb /src | |
parent | 235833535763682224d09a9b0e73fdd09657d7fc (diff) | |
download | gnunet-a649dcbd9b204c7ec807d711e4c1bf7cb2edf5ae.tar.gz gnunet-a649dcbd9b204c7ec807d711e4c1bf7cb2edf5ae.zip |
move namestore plugin
Diffstat (limited to 'src')
-rw-r--r-- | src/namestore/Makefile.am | 57 | ||||
-rw-r--r-- | src/namestore/plugin_rest_namestore.c (renamed from src/rest-plugins/plugin_rest_namestore.c) | 0 | ||||
-rw-r--r-- | src/rest-plugins/Makefile.am | 13 |
3 files changed, 40 insertions, 30 deletions
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index ac4eebd06..25941b4fb 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -104,10 +104,50 @@ TESTS = \ | |||
104 | $(check_SCRIPTS) | 104 | $(check_SCRIPTS) |
105 | endif | 105 | endif |
106 | 106 | ||
107 | if HAVE_MHD | ||
108 | if HAVE_JSON | ||
109 | REST_PLUGIN = libgnunet_plugin_rest_namestore.la | ||
110 | endif | ||
111 | endif | ||
112 | |||
107 | lib_LTLIBRARIES = \ | 113 | lib_LTLIBRARIES = \ |
108 | libgnunetnamestore.la | 114 | libgnunetnamestore.la |
109 | 115 | ||
110 | 116 | ||
117 | libexec_PROGRAMS = \ | ||
118 | gnunet-service-namestore | ||
119 | |||
120 | bin_PROGRAMS = \ | ||
121 | gnunet-namestore \ | ||
122 | gnunet-zoneimport | ||
123 | |||
124 | if HAVE_MHD | ||
125 | libexec_PROGRAMS += \ | ||
126 | gnunet-namestore-fcfsd | ||
127 | endif | ||
128 | |||
129 | |||
130 | plugin_LTLIBRARIES = \ | ||
131 | $(SQLITE_PLUGIN) \ | ||
132 | $(POSTGRES_PLUGIN) \ | ||
133 | $(HEAP_PLUGIN) \ | ||
134 | $(REST_PLUGIN) | ||
135 | |||
136 | |||
137 | libgnunet_plugin_rest_namestore_la_SOURCES = \ | ||
138 | plugin_rest_namestore.c | ||
139 | libgnunet_plugin_rest_namestore_la_LIBADD = \ | ||
140 | libgnunetnamestore.la \ | ||
141 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
142 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
143 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
144 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | ||
145 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
146 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
147 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | ||
148 | $(GN_PLUGIN_LDFLAGS) | ||
149 | |||
150 | |||
111 | libgnunetnamestore_la_SOURCES = \ | 151 | libgnunetnamestore_la_SOURCES = \ |
112 | namestore_api.c \ | 152 | namestore_api.c \ |
113 | namestore_api_monitor.c \ | 153 | namestore_api_monitor.c \ |
@@ -121,17 +161,6 @@ libgnunetnamestore_la_LDFLAGS = \ | |||
121 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 161 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
122 | -version-info 0:1:0 | 162 | -version-info 0:1:0 |
123 | 163 | ||
124 | libexec_PROGRAMS = \ | ||
125 | gnunet-service-namestore | ||
126 | |||
127 | bin_PROGRAMS = \ | ||
128 | gnunet-namestore \ | ||
129 | gnunet-zoneimport | ||
130 | |||
131 | if HAVE_MHD | ||
132 | libexec_PROGRAMS += \ | ||
133 | gnunet-namestore-fcfsd | ||
134 | endif | ||
135 | 164 | ||
136 | 165 | ||
137 | gnunet_zoneimport_SOURCES = \ | 166 | gnunet_zoneimport_SOURCES = \ |
@@ -176,12 +205,6 @@ gnunet_service_namestore_LDADD = \ | |||
176 | $(GN_LIBINTL) | 205 | $(GN_LIBINTL) |
177 | 206 | ||
178 | 207 | ||
179 | plugin_LTLIBRARIES = \ | ||
180 | $(SQLITE_PLUGIN) \ | ||
181 | $(POSTGRES_PLUGIN) \ | ||
182 | $(HEAP_PLUGIN) | ||
183 | |||
184 | |||
185 | 208 | ||
186 | libgnunet_plugin_namestore_heap_la_SOURCES = \ | 209 | libgnunet_plugin_namestore_heap_la_SOURCES = \ |
187 | plugin_namestore_heap.c | 210 | plugin_namestore_heap.c |
diff --git a/src/rest-plugins/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c index 26a037eae..26a037eae 100644 --- a/src/rest-plugins/plugin_rest_namestore.c +++ b/src/namestore/plugin_rest_namestore.c | |||
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am index e99d88676..ff14bcc0b 100644 --- a/src/rest-plugins/Makefile.am +++ b/src/rest-plugins/Makefile.am | |||
@@ -58,17 +58,4 @@ libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | |||
58 | 58 | ||
59 | 59 | ||
60 | 60 | ||
61 | libgnunet_plugin_rest_namestore_la_SOURCES = \ | ||
62 | plugin_rest_namestore.c | ||
63 | libgnunet_plugin_rest_namestore_la_LIBADD = \ | ||
64 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | ||
65 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
66 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
67 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
68 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | ||
69 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
70 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
71 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | ||
72 | $(GN_PLUGIN_LDFLAGS) | ||
73 | |||
74 | 61 | ||