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

diff --git a/src/Makefile.am b/src/Makefile.am
index d3bd856e9..9796f0376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,19 +6,31 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns set dv $(CONSENSUS) $(EXPERIMENTATION)
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION)
 endif
 
-if LINUX
-# All of these currently only work on GNU/Linux or W32
- LINUX_DIR = exit vpn pt
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = vpn exit pt
 endif
 
 if HAVE_MYSQL
@@ -29,7 +41,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -44,7 +55,6 @@ SUBDIRS = \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -54,17 +64,25 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
-  stream \
   dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)