missing check

[oweals/gnunet.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 62a08cb5aa9c357a832236baa04ffe82c964a912..b77025a3e61909046f6204ddb9f9f44826e43629 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,24 +2,15 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if HAVE_LIBIDN
- EXIT = exit
- PT = pt
-else
- EXIT =
- PT =
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ EXPERIMENTATION = experimentation
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns set dv consensus experimentation
-endif
-
-if LINUX
-# All of these currently only work on GNU/Linux
- LINUX_DIR = $(EXIT) vpn $(PT)
-endif
-if MINGW
- MINGW_DIR = vpn $(EXIT)
+ EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
 endif
 
 if HAVE_MYSQL
@@ -39,13 +30,12 @@ SUBDIRS = \
   block \
   statistics \
   arm \
-  testing \
+  $(TESTING) \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -54,7 +44,7 @@ SUBDIRS = \
   ats-tool \
   peerinfo-tool \
   core \
-  testbed \
+  $(TESTBED) \
   nse \
   dht \
   hostlist \
@@ -62,10 +52,16 @@ SUBDIRS = \
   regex \
   mesh \
   lockmanager \
-  stream \
   dns \
+  identity \
+  set \
+  namestore \
+  vpn \
+  gns \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
   $(EXP_DIR) 
+
+# note: namestore, gns are not listed right now as they are being reworked to use the new crypto