diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-03-17 19:24:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-03-17 19:24:35 +0000 |
commit | a5361231e36224607d8c2c1376757c0b99f34f59 (patch) | |
tree | ee2ee9fa2c114c6b8e5850f9b31d2bbb54b8c5d2 /src/Makefile.am | |
parent | 23b982b51e8f1c152053154c0fce4cfc4cfcbf67 (diff) | |
download | gnunet-a5361231e36224607d8c2c1376757c0b99f34f59.tar.gz gnunet-a5361231e36224607d8c2c1376757c0b99f34f59.zip |
adding library for basic JSON conversions
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index edfbb6922..47d6896cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -21,14 +21,18 @@ if HAVE_EXPERIMENTAL | |||
21 | psyc \ | 21 | psyc \ |
22 | rps \ | 22 | rps \ |
23 | social \ | 23 | social \ |
24 | $(CONSENSUS) \ | 24 | $(CONSENSUS) \ |
25 | $(SECRETSHARING) \ | 25 | $(SECRETSHARING) \ |
26 | $(SENSOR) \ | 26 | $(SENSOR) \ |
27 | $(SENSORDASHBOARD) | 27 | $(SENSORDASHBOARD) |
28 | endif | 28 | endif |
29 | 29 | ||
30 | if HAVE_REST | 30 | if HAVE_REST |
31 | EXP_DIR += identity-provider | 31 | PROVIDER_DIR = identity-provider |
32 | endif | ||
33 | |||
34 | if HAVE_JSON | ||
35 | JSON_DIR = json | ||
32 | endif | 36 | endif |
33 | 37 | ||
34 | if BUILD_PULSE_HELPERS | 38 | if BUILD_PULSE_HELPERS |
@@ -60,7 +64,8 @@ else | |||
60 | SUBDIRS = \ | 64 | SUBDIRS = \ |
61 | include $(INTLEMU_SUBDIRS) \ | 65 | include $(INTLEMU_SUBDIRS) \ |
62 | util \ | 66 | util \ |
63 | $(REST_DIR) \ | 67 | $(JSON_DIR) \ |
68 | $(REST_DIR) \ | ||
64 | hello \ | 69 | hello \ |
65 | tun \ | 70 | tun \ |
66 | block \ | 71 | block \ |
@@ -104,6 +109,7 @@ SUBDIRS = \ | |||
104 | exit \ | 109 | exit \ |
105 | pt \ | 110 | pt \ |
106 | integration-tests \ | 111 | integration-tests \ |
107 | $(EXP_DIR) | 112 | $(EXP_DIR) \ |
113 | $(PROVIDER_DIR) | ||
108 | 114 | ||
109 | endif | 115 | endif |