move experimental subsystems into experimental build...

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d0284157027399efe76392da01a661546ce48cb..d8d5487066c4ab969753104ea86e183e2e1a35dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,13 +11,23 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  rps
+  rps \
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social 
 #  dv (FTBFS)
 if HAVE_ABE
-  EXP_DIR += abe \
-                                                credential \
-                  identity-attribute \
-                                                identity-provider 
+ EXP_DIR += \
+    abe \
+    credential \
+    identity-attribute \
+    identity-provider 
+endif
+if HAVE_JSON
+ EXP_DIR += \
+    auction
 endif
 endif
 
@@ -59,9 +69,6 @@ if HAVE_JSON
 endif
 endif
 
-if HAVE_JSON
-  AUCTION_DIR = auction
-endif
 
 if TALER_ONLY
 SUBDIRS = \
@@ -123,12 +130,6 @@ SUBDIRS = \
   pt \
   secretsharing \
   integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
   $(EXP_DIR)
 
 endif