RPS: Change cosmetics - fix indentation

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 98ca70ae3254aaac9fbf570cdc26c06ac3a59e1f..39cbaa8936890225b43ec1f2f464cdf978984fee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,22 +6,30 @@
 if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed-logger testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   rps \
-  $(CONSENSUS) \
-  $(SECRETSHARING)
-
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social 
+#  dv (FTBFS)
+if HAVE_ABE
+if HAVE_JSON
+ EXP_DIR += \
+    abe \
+    credential \
+    reclaim-attribute \
+    reclaim 
+endif
 endif
-
 if HAVE_JSON
-if HAVE_MHD
-  PROVIDER_DIR = identity-provider
+ EXP_DIR += \
+    auction
 endif
 endif
 
@@ -44,21 +52,25 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
 if HAVE_MYSQL
  MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = pq postgres
+ POSTGRES_DIR = pq
 endif
 
 if HAVE_MHD
- REST_DIR = rest
 if HAVE_JSON
- JSONAPI_DIR = jsonapi
+ REST_DIR = rest rest-plugins
 endif
 endif
 
+
 if TALER_ONLY
 SUBDIRS = \
  include \
@@ -68,16 +80,14 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-  $(JSON_DIR) \
-  $(REST_DIR) \
-  $(JSONAPI_DIR) \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -85,13 +95,14 @@ SUBDIRS = \
   template \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
@@ -99,27 +110,25 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
   peerstore \
   cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
   vpn \
   gns \
+  zonemaster \
   $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  secretsharing \
+       $(EXP_DIR) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+  integration-tests 
 
 endif