X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=08693ec026cebf859923c6442af13bec66531f73;hb=f57cbab24fb7a22fc982eb8b6c4a2d18402be460;hp=20a34afa3eea39a29957fc97203ea33728a8305b;hpb=56e461524236cb354828c66c02974512f708e6c4;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 20a34afa3..08693ec02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,13 +6,30 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+# SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
-#note: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+ EXP_DIR = \
+  dv \
+  scalarproduct \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(EXPERIMENTATION)
+endif
+
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
 endif
 
 if HAVE_MYSQL
@@ -23,7 +40,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -47,22 +63,25 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  revocation \
+  gnsrecord \
+  namecache \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) 
-
+  $(EXP_DIR)