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 98ca70ae3254aaac9fbf570cdc26c06ac3a59e1f..ab8731fc27354c1756aefd6f2ae935f0213a2606 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-6,22
+6,20
@@
if HAVE_TESTING
TESTING = testing
TESTBED = testbed-logger testbed
if HAVE_TESTING
TESTING = testing
TESTBED = testbed-logger testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
+ ATS_TESTS = ats-tests
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
- dv \
rps \
rps \
- $(CONSENSUS) \
- $(SECRETSHARING)
-
+ credential
+if HAVE_ABE
+ EXP_DIR += \
+ abe
endif
endif
-
if HAVE_JSON
if HAVE_JSON
-if HAVE_MHD
- PROVIDER_DIR = identity-provider
+ EXP_DIR += \
+ auction
endif
endif
endif
endif
@@
-44,21
+42,25
@@
CONVERSATION_DIR = conversation
endif
endif
endif
endif
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
if HAVE_MYSQL
MYSQL_DIR = mysql my
endif
if HAVE_POSTGRESQL
if HAVE_MYSQL
MYSQL_DIR = mysql my
endif
if HAVE_POSTGRESQL
- POSTGRES_DIR = pq
postgres
+ POSTGRES_DIR = pq
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
+
if TALER_ONLY
SUBDIRS = \
include \
if TALER_ONLY
SUBDIRS = \
include \
@@
-68,30
+70,33
@@
else
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
- $(JSON_DIR) \
- $(REST_DIR) \
- $(JSONAPI_DIR) \
+ nt \
+ gnsrecord \
hello \
hello \
- tun \
block \
statistics \
arm \
$(TESTING) \
block \
statistics \
arm \
$(TESTING) \
+ $(JSON_DIR) \
+ $(REST_DIR) \
peerinfo \
peerinfo \
+ $(SQLITE_DIR) \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
template \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
template \
+ peerstore \
ats \
nat \
ats \
nat \
+ nat-auto \
fragmentation \
transport \
ats-tool \
peerinfo-tool \
core \
$(TESTBED) \
fragmentation \
transport \
ats-tool \
peerinfo-tool \
core \
$(TESTBED) \
-
ats-tests
\
+
$(ATS_TESTS)
\
nse \
dht \
hostlist \
nse \
dht \
hostlist \
@@
-99,27
+104,24
@@
SUBDIRS = \
regex \
dns \
identity \
regex \
dns \
identity \
- gnsrecord \
namecache \
namestore \
namecache \
namestore \
- peerstore \
cadet \
set \
cadet \
set \
+ consensus \
scalarproduct \
revocation \
vpn \
gns \
scalarproduct \
revocation \
vpn \
gns \
+ zonemaster \
$(CONVERSATION_DIR) \
fs \
exit \
pt \
$(CONVERSATION_DIR) \
fs \
exit \
pt \
- integration-tests \
- multicast \
- psycutil \
- psycstore \
- psyc \
- social \
+ secretsharing \
+ reclaim-attribute \
+ reclaim \
$(EXP_DIR) \
$(EXP_DIR) \
- $(PROVIDER_DIR)
+ integration-tests
endif
endif