X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=8746a47e25a540143ef3f5b51e872112d42af664;hb=b9839a135dd632f419475b5db7637e6e3bbe67d1;hp=b77025a3e61909046f6204ddb9f9f44826e43629;hpb=89ec7458ef0a7f36ab46cae7d2161dd2006633dd;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index b77025a3e..8746a47e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,10 +7,24 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = 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
+
+
+if HAVE_PULSE
+if HAVE_OPUS
+  CONVERSATION_DIR = conversation
+endif
 endif
 
 if HAVE_MYSQL
@@ -21,7 +35,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -45,23 +58,25 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  dv \
+  revocation \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
+  psycstore \
   fs \
   exit \
   pt \
   integration-tests \
   $(EXP_DIR) 
-
-# note: namestore, gns are not listed right now as they are being reworked to use the new crypto