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

diff --git a/src/Makefile.am b/src/Makefile.am
index c6d2f4874..9796f0376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +2,35 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ SECRETSHARING = secretsharing
+ EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
+endif
+
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv stream 
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION)
 endif
 
-if LINUX
-# All of these currently only work on GNU/Linux
- LINUX_DIR = dns exit vpn gns pt
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = dns vpn gns
 endif
 
 if HAVE_MYSQL
@@ -22,7 +41,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -31,13 +49,12 @@ SUBDIRS = \
   block \
   statistics \
   arm \
-  testing \
+  $(TESTING) \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -46,17 +63,26 @@ SUBDIRS = \
   ats-tool \
   peerinfo-tool \
   core \
-  testbed \
-  testing_old \
+  $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
-  fs \
   regex \
   mesh \
-  lockmanager \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
+  fs \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)