summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--po/POTFILES.in3
-rw-r--r--src/identity-provider/Makefile.am9
-rw-r--r--src/include/gnunet_json_lib.h6
-rw-r--r--src/json/Makefile.am2
5 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 5f90eaabc..ea9bfaa99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -968,6 +968,8 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1])
+AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
+
# restore LIBS
LIBS=$SAVE_LIBS
@@ -1550,6 +1552,7 @@ src/identity/Makefile
src/identity/identity.conf
src/include/Makefile
src/integration-tests/Makefile
+src/json/Makefile
src/hostlist/Makefile
src/multicast/Makefile
src/multicast/multicast.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4665a775..103ae8c47 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -209,6 +209,9 @@ src/identity-provider/gnunet-service-identity-provider.c
src/identity-provider/identity_provider_api.c
src/identity-provider/identity_token.c
src/identity-provider/plugin_rest_identity_provider.c
+src/json/json.c
+src/json/json_generator.c
+src/json/json_helper.c
src/multicast/gnunet-multicast.c
src/multicast/gnunet-service-multicast.c
src/multicast/multicast_api.c
diff --git a/src/identity-provider/Makefile.am b/src/identity-provider/Makefile.am
index f556052cb..1e0b82528 100644
--- a/src/identity-provider/Makefile.am
+++ b/src/identity-provider/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
plugindir = $(libdir)/gnunet
if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
if USE_COVERAGE
@@ -21,7 +21,7 @@ pkgcfg_DATA = \
plugin_LTLIBRARIES = \
libgnunetidentityprovider.la \
- libgnunet_plugin_rest_identity_provider.la
+ libgnunet_plugin_rest_identity_provider.la
bin_PROGRAMS = \
gnunet-identity-token
@@ -37,6 +37,7 @@ gnunet_service_identity_provider_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(GN_LIBINTL) \
-ljansson
@@ -65,10 +66,8 @@ libgnunet_plugin_rest_identity_provider_la_LDFLAGS = \
gnunet_identity_token_SOURCES = \
- gnunet-identity-token.c
+ gnunet-identity-token.c
gnunet_identity_token_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-ljansson -lmicrohttpd \
$(GN_LIBINTL)
-
-
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index e39938858..8d8a6ee78 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -20,7 +20,9 @@
* @author Benedikt Mueller
* @author Christian Grothoff
*/
-#include "platform.h"
+#ifndef GNUNET_JSON_LIB_H
+#define GNUNET_JSON_LIB_H
+
#include <gnunet/gnunet_util_lib.h>
#include <jansson.h>
@@ -349,6 +351,6 @@ json_t *
GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *sig);
-
+#endif
/* end of gnunet_json_lib.h */
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 83cd6dd2d..104fbe06e 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -17,7 +17,7 @@ libgnunetjson_la_SOURCES = \
json_generator.c \
json_helper.c
libgnunetjson_la_LIBADD = \
- -lgnunetutil \
+ $(top_builddir)/src/util/libgnunetutil.la \
-ljansson \
$(XLIB)