projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link namesotre to libgnunetgnsrecord too
[oweals/gnunet.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 62a08cb5aa9c357a832236baa04ffe82c964a912..41866426dee7d1de2271216d803ea03b39e9f9e7 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,24
+2,29
@@
# INTLEMU_SUBDIRS = intlemu
#endif
# INTLEMU_SUBDIRS = intlemu
#endif
-if HAVE_
LIBIDN
- EXIT = exit
- PT = pt
-else
- EX
IT =
- PT =
+if HAVE_
TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ EX
PERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
endif
if HAVE_EXPERIMENTAL
endif
if HAVE_EXPERIMENTAL
- EXP_DIR = gns set dv consensus experimentation
+ 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 = $(EXIT) vpn $(PT)
+
+if HAVE_PULSE
+if HAVE_OPUS
+ CONVERSATION_DIR = conversation
endif
endif
-if MINGW
- MINGW_DIR = vpn $(EXIT)
endif
if HAVE_MYSQL
endif
if HAVE_MYSQL
@@
-30,7
+35,6
@@
if HAVE_POSTGRES
POSTGRES_DIR = postgres
endif
POSTGRES_DIR = postgres
endif
-
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
util \
@@
-39,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 \
@@
-54,18
+57,28
@@
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 \
dns \
+ identity \
+ set \
+ dv \
+ revocation \
+ gnsrecord \
+ namecache \
+ namestore \
+ vpn \
+ gns \
+ $(CONVERSATION_DIR) \
+ psycstore \
fs \
fs \
-
$(LINUX_DIR)
\
-
$(MINGW_DIR)
\
+
exit
\
+
pt
\
integration-tests \
integration-tests \
- $(EXP_DIR)
+ $(EXP_DIR)