projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consensus: destroy set handles
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index c2e6fd64ec24f13b9d2fb8ea1d1f05e285576d02..e466cbc28f2b27b9523be634e648ca95b236bfb7 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-5,23
+5,21
@@
if HAVE_TESTING
TESTING = testing
if HAVE_TESTING
TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
dv \
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
dv \
- rps \
- $(CONSENSUS) \
- $(SECRETSHARING)
-
+ rps
endif
endif
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
PROVIDER_DIR = identity-provider
endif
PROVIDER_DIR = identity-provider
endif
+endif
if HAVE_JSON
JSON_DIR = json
if HAVE_JSON
JSON_DIR = json
@@
-42,21
+40,29
@@
CONVERSATION_DIR = conversation
endif
endif
endif
endif
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
if HAVE_MYSQL
if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql
my
endif
if HAVE_POSTGRESQL
POSTGRES_DIR = pq postgres
endif
endif
if HAVE_POSTGRESQL
POSTGRES_DIR = pq postgres
endif
-if HAVE_
REST
+if HAVE_
MHD
REST_DIR = rest
if HAVE_JSON
JSONAPI_DIR = jsonapi
endif
endif
REST_DIR = rest
if HAVE_JSON
JSONAPI_DIR = jsonapi
endif
endif
+if HAVE_JSON
+ AUCTION_DIR = auction
+endif
+
if TALER_ONLY
SUBDIRS = \
include \
if TALER_ONLY
SUBDIRS = \
include \
@@
-67,8
+73,8
@@
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
$(JSON_DIR) \
include $(INTLEMU_SUBDIRS) \
util \
$(JSON_DIR) \
- $(JSONAPI_DIR) \
$(REST_DIR) \
$(REST_DIR) \
+ $(JSONAPI_DIR) \
hello \
tun \
block \
hello \
tun \
block \
@@
-76,6
+82,7
@@
SUBDIRS = \
arm \
$(TESTING) \
peerinfo \
arm \
$(TESTING) \
peerinfo \
+ $(SQLITE_DIR) \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
@@
-83,40
+90,45
@@
SUBDIRS = \
template \
ats \
nat \
template \
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 \
topology \
regex \
nse \
dht \
hostlist \
topology \
regex \
- cadet \
dns \
identity \
dns \
identity \
- set \
- scalarproduct \
- revocation \
gnsrecord \
namecache \
namestore \
gnsrecord \
namecache \
namestore \
+ peerstore \
+ cadet \
+ set \
+ consensus \
+ scalarproduct \
+ revocation \
vpn \
gns \
vpn \
gns \
+ zonemaster \
$(CONVERSATION_DIR) \
$(CONVERSATION_DIR) \
- peerstore \
fs \
exit \
pt \
fs \
exit \
pt \
+ secretsharing \
integration-tests \
multicast \
psycutil \
psycstore \
psyc \
social \
integration-tests \
multicast \
psycutil \
psycstore \
psyc \
social \
+ $(AUCTION_DIR) \
$(EXP_DIR) \
$(PROVIDER_DIR)
$(EXP_DIR) \
$(PROVIDER_DIR)