X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=9796f037666d2a9084c2497775c95765a0949d5f;hb=852078ede997226aa93814537cff282d4a1bc1be;hp=c2a64918fe5676418f720bedef3d8e62e65c117d;hpb=4d3f7a77e8c79b639d1a1280a005def87dc227be;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c2a64918f..9796f0376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,13 +6,31 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
  SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv multicast $(CONSENSUS) $(EXPERIMENTATION) 
-#note: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION)
+endif
+
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
 endif
 
 if HAVE_MYSQL
@@ -23,7 +41,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -54,17 +71,18 @@ SUBDIRS = \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  revocation \
+  gnsrecord \
+  namecache \
   namestore \
   vpn \
   gns \
-  psycstore \
+  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) 
-
+  $(EXP_DIR)