projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ats_ril: - removed some redundantly saved plugin environment attributes
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index ab51ee178047ff5e6624cb2ee5e60596cc680e54..8746a47e25a540143ef3f5b51e872112d42af664 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,16
+2,29
@@
# INTLEMU_SUBDIRS = intlemu
#endif
# INTLEMU_SUBDIRS = intlemu
#endif
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
+endif
+
if HAVE_EXPERIMENTAL
if HAVE_EXPERIMENTAL
- EXP_DIR = gns chat consensus dv set
+ EXP_DIR = \
+ multicast \
+ env \
+ psyc \
+ $(CONSENSUS) \
+ $(EXPERIMENTATION)
+ # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
endif
endif
-if LINUX
-# All of these currently only work on GNU/Linux
- LINUX_DIR = dns exit vpn pt
+
+if HAVE_PULSE
+if HAVE_OPUS
+ CONVERSATION_DIR = conversation
endif
endif
-if MINGW
- MINGW_DIR = dns vpn exit
endif
if HAVE_MYSQL
endif
if HAVE_MYSQL
@@
-22,7
+35,6
@@
if HAVE_POSTGRES
POSTGRES_DIR = postgres
endif
POSTGRES_DIR = postgres
endif
-
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
@@
-31,13
+43,12
@@
SUBDIRS = \
block \
statistics \
arm \
block \
statistics \
arm \
-
testing
\
+
$(TESTING)
\
peerinfo \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
peerinfo \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
- namestore \
template \
ats \
nat \
template \
ats \
nat \
@@
-46,17
+57,26
@@
SUBDIRS = \
ats-tool \
peerinfo-tool \
core \
ats-tool \
peerinfo-tool \
core \
- testbed \
+ $(TESTBED) \
+ ats-tests \
nse \
dht \
hostlist \
topology \
regex \
mesh \
nse \
dht \
hostlist \
topology \
regex \
mesh \
- lockmanager \
- stream \
+ dns \
+ identity \
+ set \
+ dv \
+ revocation \
+ namestore \
+ vpn \
+ gns \
+ $(CONVERSATION_DIR) \
+ psycstore \
fs \
fs \
-
$(LINUX_DIR)
\
-
$(MINGW_DIR)
\
+
exit
\
+
pt
\
integration-tests \
$(EXP_DIR)
integration-tests \
$(EXP_DIR)