projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing resource leaks
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 1016e41edad5d7b04fac407d7668fa4cb2ba8998..9796f037666d2a9084c2497775c95765a0949d5f 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-6,19
+6,31
@@
if HAVE_TESTING
TESTING = testing
TESTBED = testbed
CONSENSUS = consensus
TESTING = testing
TESTBED = testbed
CONSENSUS = consensus
+ SECRETSHARING = secretsharing
EXPERIMENTATION = experimentation
EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
endif
if HAVE_EXPERIMENTAL
endif
if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION)
+ EXP_DIR = \
+ dv \
+ multicast \
+ env \
+ psycstore \
+ psyc \
+ $(CONSENSUS) \
+ $(SECRETSHARING) \
+ $(SCALARPRODUCT) \
+ $(EXPERIMENTATION)
endif
endif
-if LINUX
-# All of these currently only work on GNU/Linux or W32
- LINUX_DIR = exit vpn pt
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
endif
endif
-if MINGW
- MINGW_DIR = vpn exit pt
endif
if HAVE_MYSQL
endif
if HAVE_MYSQL
@@
-29,7
+41,6
@@
if HAVE_POSTGRES
POSTGRES_DIR = postgres
endif
POSTGRES_DIR = postgres
endif
-
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
@@
-53,22
+64,25
@@
SUBDIRS = \
peerinfo-tool \
core \
$(TESTBED) \
peerinfo-tool \
core \
$(TESTBED) \
+ ats-tests \
nse \
dht \
hostlist \
topology \
regex \
mesh \
nse \
dht \
hostlist \
topology \
regex \
mesh \
- lockmanager \
dns \
identity \
set \
dns \
identity \
set \
+ revocation \
+ gnsrecord \
+ namecache \
namestore \
namestore \
+ vpn \
gns \
gns \
+ $(CONVERSATION_DIR) \
fs \
fs \
-
$(LINUX_DIR)
\
-
$(MINGW_DIR)
\
+
exit
\
+
pt
\
integration-tests \
integration-tests \
- $(EXP_DIR)
-
-# note: namestore, gns are not listed right now as they are being reworked to use the new crypto
\ No newline at end of file
+ $(EXP_DIR)