projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://gnunet.org/gnunet
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 6e0fa5c4b866434162ddc97f67ae2d57dd637d08..e466cbc28f2b27b9523be634e648ca95b236bfb7 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-5,30
+5,31
@@
if HAVE_TESTING
TESTING = testing
if HAVE_TESTING
TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
dv \
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
dv \
- multicast \
- env \
- psycstore \
- psyc \
- rps \
- social \
- $(CONSENSUS) \
- $(SECRETSHARING) \
- $(SENSOR) \
- $(SENSORDASHBOARD)
+ rps
endif
endif
-if HAVE_REST
- EXP_DIR += identity-provider
+if HAVE_JSON
+if HAVE_MHD
+ PROVIDER_DIR = identity-provider
+endif
+endif
+
+if HAVE_JSON
+ JSON_DIR = json
+if HAVE_LIBGNURL
+ JSON_DIR += curl
+else
+if HAVE_LIBCURL
+ JSON_DIR += curl
+endif
+endif
endif
if BUILD_PULSE_HELPERS
endif
if BUILD_PULSE_HELPERS
@@
-39,16
+40,27
@@
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
endif
if HAVE_POSTGRESQL
- POSTGRES_DIR = postgres
+ POSTGRES_DIR = p
q p
ostgres
endif
endif
-if HAVE_
REST
+if HAVE_
MHD
REST_DIR = rest
REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
+endif
+
+if HAVE_JSON
+ AUCTION_DIR = auction
endif
if TALER_ONLY
endif
if TALER_ONLY
@@
-60,7
+72,9
@@
else
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
- $(REST_DIR) \
+ $(JSON_DIR) \
+ $(REST_DIR) \
+ $(JSONAPI_DIR) \
hello \
tun \
block \
hello \
tun \
block \
@@
-68,6
+82,7
@@
SUBDIRS = \
arm \
$(TESTING) \
peerinfo \
arm \
$(TESTING) \
peerinfo \
+ $(SQLITE_DIR) \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
@@
-75,35
+90,46
@@
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 \
integration-tests \
- $(EXP_DIR)
+ multicast \
+ psycutil \
+ psycstore \
+ psyc \
+ social \
+ $(AUCTION_DIR) \
+ $(EXP_DIR) \
+ $(PROVIDER_DIR)
endif
endif