-preparations for replacement of try_connect call

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

diff --git a/src/Makefile.am b/src/Makefile.am
index b77025a3e61909046f6204ddb9f9f44826e43629..76997918fa8768929c2a80a774e1bba013702fc5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 #if WANT_FRAMEWORK
 #  INTLEMU_SUBDIRS = intlemu
 #endif
@@ -6,25 +7,60 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
- EXPERIMENTATION = experimentation
+ SECRETSHARING = secretsharing
+ SENSOR = sensor
+ SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  rps \
+  social \
+       $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(SENSOR) \
+  $(SENSORDASHBOARD)
+endif
+
+if HAVE_REST
+       EXP_DIR += identity-token
+endif
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
 endif
 
 if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
  POSTGRES_DIR = postgres
 endif
 
+if HAVE_REST
+ REST_DIR = rest
+endif
+
+if TALER_ONLY
+SUBDIRS = \
+ include \
+ util
+else
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+       $(REST_DIR) \
   hello \
   tun \
   block \
@@ -45,23 +81,29 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  mesh \
-  lockmanager \
+  cadet \
   dns \
   identity \
   set \
+  scalarproduct \
+  revocation \
+  gnsrecord \
+  namecache \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
+  peerstore \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)
 
-# note: namestore, gns are not listed right now as they are being reworked to use the new crypto
+endif