summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-14 14:09:10 +0000
committerng0 <ng0@n0.is>2019-10-14 14:09:10 +0000
commit85ecc906734c1f077d815551e51df5607b7a15d7 (patch)
tree9918181e1edc31c3009e87bb0a4a8ea4654744c8
parent9297532d6c2f3c8c700b114725ce79c0a9a2e001 (diff)
parent0bd7e210600d4c391bc6c35f909f1960123de743 (diff)
downloadgnunet-85ecc906734c1f077d815551e51df5607b7a15d7.tar.gz
gnunet-85ecc906734c1f077d815551e51df5607b7a15d7.zip
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r--src/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 51bf2d63d..09d176100 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,9 +12,7 @@ endif
12if HAVE_EXPERIMENTAL 12if HAVE_EXPERIMENTAL
13 EXP_DIR = \ 13 EXP_DIR = \
14 rps \ 14 rps \
15 abd \ 15 abd
16 reclaim-attribute \
17 reclaim
18if HAVE_ABE 16if HAVE_ABE
19 EXP_DIR += \ 17 EXP_DIR += \
20 abe 18 abe
@@ -59,6 +57,9 @@ endif
59if HAVE_MHD 57if HAVE_MHD
60if HAVE_JSON 58if HAVE_JSON
61 REST_DIR = rest 59 REST_DIR = rest
60 RECLAIM_DIR = \
61 reclaim-attribute \
62 reclaim
62endif 63endif
63endif 64endif
64 65
@@ -121,6 +122,7 @@ SUBDIRS = \
121 exit \ 122 exit \
122 pt \ 123 pt \
123 secretsharing \ 124 secretsharing \
125 $(RECLAIM_DIR) \
124 $(EXP_DIR) \ 126 $(EXP_DIR) \
125 integration-tests 127 integration-tests
126 128