If 0 max search, use r5n dht

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

diff --git a/src/Makefile.am b/src/Makefile.am
index d3bd856e993dff004d350443d8fb54fb741e6161..18f8aeef2de705d70b1e32eb4fcf504fe6073a55 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,30 +6,46 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
+ SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns set dv $(CONSENSUS) $(EXPERIMENTATION)
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  social \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION) \
+  $(SENSOR) \
+  $(SENSORDASHBOARD)
 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
  MYSQL_DIR = mysql
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -44,7 +60,6 @@ SUBDIRS = \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -54,17 +69,26 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  mesh \
-  lockmanager \
-  stream \
+  cadet \
   dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
+  peerstore \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)