X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=41866426dee7d1de2271216d803ea03b39e9f9e7;hb=eec0e5088ec9437f5c0cf9d3ffef87603ad2777a;hp=5240989927249282f161ab14d3d1b50501479229;hpb=3003feb0b391420b403654d840d3c67404fab048;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 524098992..41866426d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,24 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  EXPERIMENTATION = experimentation
- VECTORPRODUCT = vectorproduct
+ SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
-#note: vectorproduct is not being listed here yet as the crypto is being reworked at the moment
+ 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
@@ -23,7 +35,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -47,23 +58,27 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  dv \
+  revocation \
+  gnsrecord \
+  namecache \
   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
+  $(EXP_DIR)