diff options
author | Markus Teich <teichm@fs.tum.de> | 2017-01-12 17:29:25 +0100 |
---|---|---|
committer | Markus Teich <teichm@fs.tum.de> | 2017-01-12 17:29:25 +0100 |
commit | 84dc6a3184d951d6b5f49e3075022a6e5895b716 (patch) | |
tree | ff4af69edf42117d1469a8af334926f4dcda7711 | |
parent | 220d336ce3bcb6444b090914a7ee72a32c915414 (diff) | |
download | gnunet-84dc6a3184d951d6b5f49e3075022a6e5895b716.tar.gz gnunet-84dc6a3184d951d6b5f49e3075022a6e5895b716.zip |
include json dependency
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/auction/Makefile.am | 4 | ||||
-rw-r--r-- | src/auction/gnunet-auction-create.c | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c6f320ae4..56f301ac0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -60,6 +60,10 @@ if HAVE_JSON | |||
60 | endif | 60 | endif |
61 | endif | 61 | endif |
62 | 62 | ||
63 | if HAVE_JSON | ||
64 | AUCTION_DIR = auction | ||
65 | endif | ||
66 | |||
63 | if TALER_ONLY | 67 | if TALER_ONLY |
64 | SUBDIRS = \ | 68 | SUBDIRS = \ |
65 | include \ | 69 | include \ |
@@ -122,7 +126,7 @@ SUBDIRS = \ | |||
122 | psycstore \ | 126 | psycstore \ |
123 | psyc \ | 127 | psyc \ |
124 | social \ | 128 | social \ |
125 | auction \ | 129 | $(AUCTION_DIR) \ |
126 | $(EXP_DIR) \ | 130 | $(EXP_DIR) \ |
127 | $(PROVIDER_DIR) | 131 | $(PROVIDER_DIR) |
128 | 132 | ||
diff --git a/src/auction/Makefile.am b/src/auction/Makefile.am index 18a3e5604..8518244fa 100644 --- a/src/auction/Makefile.am +++ b/src/auction/Makefile.am | |||
@@ -28,24 +28,28 @@ gnunet_auction_create_SOURCES = \ | |||
28 | gnunet-auction-create.c | 28 | gnunet-auction-create.c |
29 | gnunet_auction_create_LDADD = \ | 29 | gnunet_auction_create_LDADD = \ |
30 | $(top_builddir)/src/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/util/libgnunetutil.la \ |
31 | -ljansson \ | ||
31 | $(GN_LIBINTL) | 32 | $(GN_LIBINTL) |
32 | 33 | ||
33 | gnunet_auction_info_SOURCES = \ | 34 | gnunet_auction_info_SOURCES = \ |
34 | gnunet-auction-info.c | 35 | gnunet-auction-info.c |
35 | gnunet_auction_info_LDADD = \ | 36 | gnunet_auction_info_LDADD = \ |
36 | $(top_builddir)/src/util/libgnunetutil.la \ | 37 | $(top_builddir)/src/util/libgnunetutil.la \ |
38 | -ljansson \ | ||
37 | $(GN_LIBINTL) | 39 | $(GN_LIBINTL) |
38 | 40 | ||
39 | gnunet_auction_join_SOURCES = \ | 41 | gnunet_auction_join_SOURCES = \ |
40 | gnunet-auction-join.c | 42 | gnunet-auction-join.c |
41 | gnunet_auction_join_LDADD = \ | 43 | gnunet_auction_join_LDADD = \ |
42 | $(top_builddir)/src/util/libgnunetutil.la \ | 44 | $(top_builddir)/src/util/libgnunetutil.la \ |
45 | -ljansson \ | ||
43 | $(GN_LIBINTL) | 46 | $(GN_LIBINTL) |
44 | 47 | ||
45 | gnunet_service_auction_SOURCES = \ | 48 | gnunet_service_auction_SOURCES = \ |
46 | gnunet-service-auction.c | 49 | gnunet-service-auction.c |
47 | gnunet_service_auction_LDADD = \ | 50 | gnunet_service_auction_LDADD = \ |
48 | $(top_builddir)/src/util/libgnunetutil.la \ | 51 | $(top_builddir)/src/util/libgnunetutil.la \ |
52 | -ljansson \ | ||
49 | $(GN_LIBINTL) | 53 | $(GN_LIBINTL) |
50 | 54 | ||
51 | 55 | ||
diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c index fae9c13ae..c21e93f26 100644 --- a/src/auction/gnunet-auction-create.c +++ b/src/auction/gnunet-auction-create.c | |||
@@ -25,6 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_json_lib.h" | ||
28 | /* #include "gnunet_auction_service.h" */ | 29 | /* #include "gnunet_auction_service.h" */ |
29 | 30 | ||
30 | #define FIRST_PRICE 0 | 31 | #define FIRST_PRICE 0 |