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 f115fbf86cd083715496ed6a98a14bd41ded571a..8746a47e25a540143ef3f5b51e872112d42af664 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,13
+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 = chat dv stream regex lockmanager
+ 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 gns exit vpn pt
+
+if HAVE_PULSE
+if HAVE_OPUS
+ CONVERSATION_DIR = conversation
+endif
endif
if HAVE_MYSQL
endif
if HAVE_MYSQL
@@
-19,7
+35,6
@@
if HAVE_POSTGRES
POSTGRES_DIR = postgres
endif
POSTGRES_DIR = postgres
endif
-
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
@@
-28,27
+43,40
@@
SUBDIRS = \
block \
statistics \
arm \
block \
statistics \
arm \
+ $(TESTING) \
peerinfo \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
peerinfo \
$(MYSQL_DIR) \
$(POSTGRES_DIR) \
datacache \
datastore \
- namestore \
template \
ats \
nat \
fragmentation \
transport \
template \
ats \
nat \
fragmentation \
transport \
+ ats-tool \
peerinfo-tool \
core \
peerinfo-tool \
core \
-
testing
\
-
testbed
\
+
$(TESTBED)
\
+
ats-tests
\
nse \
dht \
hostlist \
topology \
nse \
dht \
hostlist \
topology \
-
fs
\
+
regex
\
mesh \
mesh \
- $(LINUX_DIR) \
+ dns \
+ identity \
+ set \
+ dv \
+ revocation \
+ namestore \
+ vpn \
+ gns \
+ $(CONVERSATION_DIR) \
+ psycstore \
+ fs \
+ exit \
+ pt \
integration-tests \
$(EXP_DIR)
integration-tests \
$(EXP_DIR)