X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=8746a47e25a540143ef3f5b51e872112d42af664;hb=fb61415cd42c7134ee6c5e6f9685007f37b80324;hp=bc80696148cfc8e86c345f739765f68edcfcc952;hpb=f12241a28dd9c0233316850c6082e2db25b155cc;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index bc8069614..8746a47e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,29 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if HAVE_LIBIDN
- DNS = dns
- EXIT = exit
- PT = pt
-else
- DNS =
- EXIT =
- PT =
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns set dv consensus experimentation
+ 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 LINUX
-# All of these currently only work on GNU/Linux
- LINUX_DIR = $(DNS) $(EXIT) vpn $(PT)
+
+if HAVE_PULSE
+if HAVE_OPUS
+  CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = $(DNS) vpn $(EXIT)
 endif
 
 if HAVE_MYSQL
@@ -32,7 +35,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -41,13 +43,12 @@ SUBDIRS = \
   block \
   statistics \
   arm \
-  testing \
+  $(TESTING) \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -56,17 +57,26 @@ SUBDIRS = \
   ats-tool \
   peerinfo-tool \
   core \
-  testbed \
+  $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
-  stream \ 
+  dns \
+  identity \
+  set \
+  dv \
+  revocation \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
+  psycstore \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
   $(EXP_DIR)