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 d04cba9dd0a6c229ea54e092a38f962623292beb..e466cbc28f2b27b9523be634e648ca95b236bfb7 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-6,17
+6,13
@@
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 = \
dv \
endif
if HAVE_EXPERIMENTAL
EXP_DIR = \
dv \
- rps \
- $(CONSENSUS) \
- $(SECRETSHARING)
-
+ rps
endif
if HAVE_JSON
endif
if HAVE_JSON
@@
-44,6
+40,10
@@
CONVERSATION_DIR = conversation
endif
endif
endif
endif
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
if HAVE_MYSQL
MYSQL_DIR = mysql my
endif
if HAVE_MYSQL
MYSQL_DIR = mysql my
endif
@@
-59,6
+59,10
@@
if HAVE_JSON
endif
endif
endif
endif
+if HAVE_JSON
+ AUCTION_DIR = auction
+endif
+
if TALER_ONLY
SUBDIRS = \
include \
if TALER_ONLY
SUBDIRS = \
include \
@@
-78,6
+82,7
@@
SUBDIRS = \
arm \
$(TESTING) \
peerinfo \
arm \
$(TESTING) \
peerinfo \
+ $(SQLITE_DIR) \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
@@
-92,7
+97,7
@@
SUBDIRS = \
peerinfo-tool \
core \
$(TESTBED) \
peerinfo-tool \
core \
$(TESTBED) \
-
ats-tests
\
+
$(ATS_TESTS)
\
nse \
dht \
hostlist \
nse \
dht \
hostlist \
@@
-106,6
+111,7
@@
SUBDIRS = \
peerstore \
cadet \
set \
peerstore \
cadet \
set \
+ consensus \
scalarproduct \
revocation \
vpn \
scalarproduct \
revocation \
vpn \
@@
-115,12
+121,14
@@
SUBDIRS = \
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)