-preparations for replacement of try_connect call

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8efb7afe65fc0d84e461cb2acdad86c50c4c22f4..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
@@ -7,8 +8,6 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
  SENSOR = sensor
  SENSORDASHBOARD = sensordashboard
 endif
@@ -22,14 +21,15 @@ if HAVE_EXPERIMENTAL
   psyc \
   rps \
   social \
-  $(CONSENSUS) \
+       $(CONSENSUS) \
   $(SECRETSHARING) \
-  $(SCALARPRODUCT) \
-  $(EXPERIMENTATION) \
   $(SENSOR) \
   $(SENSORDASHBOARD)
 endif
 
+if HAVE_REST
+       EXP_DIR += identity-token
+endif
 
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
@@ -47,9 +47,20 @@ 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 \
@@ -80,6 +91,7 @@ SUBDIRS = \
   dns \
   identity \
   set \
+  scalarproduct \
   revocation \
   gnsrecord \
   namecache \
@@ -93,3 +105,5 @@ SUBDIRS = \
   pt \
   integration-tests \
   $(EXP_DIR)
+
+endif