projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
REST/NAMESTORE: rework API
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 79f7e3ddc341549b1f66ba599c8857a2902519f1..ab8731fc27354c1756aefd6f2ae935f0213a2606 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-12,24
+12,14
@@
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
rps \
if HAVE_EXPERIMENTAL
EXP_DIR = \
rps \
- multicast \
- psycutil \
- psycstore \
- psyc \
- social
-# dv (FTBFS)
+ credential
if HAVE_ABE
if HAVE_ABE
-if HAVE_JSON
EXP_DIR += \
EXP_DIR += \
- abe \
- credential \
- reclaim-attribute \
- reclaim
-endif
+ abe
endif
if HAVE_JSON
EXP_DIR += \
endif
if HAVE_JSON
EXP_DIR += \
-
auction
+ auction
endif
endif
endif
endif
@@
-65,9
+55,8
@@
if HAVE_POSTGRESQL
endif
if HAVE_MHD
endif
if HAVE_MHD
- REST_DIR = rest
if HAVE_JSON
if HAVE_JSON
- JSONAPI_DIR = jsonapi
+ REST_DIR = rest
endif
endif
endif
endif
@@
-81,15
+70,15
@@
else
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
- gnsrecord \
- $(JSON_DIR) \
- $(REST_DIR) \
- $(JSONAPI_DIR) \
+ nt \
+ gnsrecord \
hello \
block \
statistics \
arm \
$(TESTING) \
hello \
block \
statistics \
arm \
$(TESTING) \
+ $(JSON_DIR) \
+ $(REST_DIR) \
peerinfo \
$(SQLITE_DIR) \
$(MYSQL_DIR) \
peerinfo \
$(SQLITE_DIR) \
$(MYSQL_DIR) \
@@
-97,6
+86,7
@@
SUBDIRS = \
datacache \
datastore \
template \
datacache \
datastore \
template \
+ peerstore \
ats \
nat \
nat-auto \
ats \
nat \
nat-auto \
@@
-116,7
+106,6
@@
SUBDIRS = \
identity \
namecache \
namestore \
identity \
namecache \
namestore \
- peerstore \
cadet \
set \
consensus \
cadet \
set \
consensus \
@@
-130,7
+119,9
@@
SUBDIRS = \
exit \
pt \
secretsharing \
exit \
pt \
secretsharing \
- integration-tests \
- $(EXP_DIR)
+ reclaim-attribute \
+ reclaim \
+ $(EXP_DIR) \
+ integration-tests
endif
endif