X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=39cbaa8936890225b43ec1f2f464cdf978984fee;hb=eb369f2fb4e05d969ad1b9e2b8c03ac73dfdb32c;hp=5785242ba9767020116a28f54b821c4fb305d206;hpb=171cfeb1b32e21d12a1dbcbc5a9099bab37fab7e;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5785242ba..39cbaa893 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,27 +5,43 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
+  rps \
   multicast \
-  env \
+  psycutil \
   psycstore \
   psyc \
-  rps \
-  social \
-	identity-token \
-  $(CONSENSUS) \
-  $(SECRETSHARING) \
-  $(SENSOR) \
-  $(SENSORDASHBOARD)
+  social 
+#  dv (FTBFS)
+if HAVE_ABE
+if HAVE_JSON
+ EXP_DIR += \
+    abe \
+    credential \
+    reclaim-attribute \
+    reclaim 
+endif
+endif
+if HAVE_JSON
+ EXP_DIR += \
+    auction
+endif
+endif
+
+if HAVE_JSON
+  JSON_DIR = json
+if HAVE_LIBGNURL
+  JSON_DIR += curl
+else
+if HAVE_LIBCURL
+  JSON_DIR += curl
+endif
+endif
 endif
 
 if BUILD_PULSE_HELPERS
@@ -36,17 +52,24 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = postgres
+ POSTGRES_DIR = pq
 endif
 
-if HAVE_REST
- REST_DIR = rest
+if HAVE_MHD
+if HAVE_JSON
+ REST_DIR = rest rest-plugins
 endif
+endif
+
 
 if TALER_ONLY
 SUBDIRS = \
@@ -57,14 +80,14 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-	$(REST_DIR) \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -72,35 +95,40 @@ SUBDIRS = \
   template \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  cadet \
   dns \
   identity \
+  namecache \
+  namestore \
+  peerstore \
+  cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
-  gnsrecord \
-  namecache \
-  namestore \
   vpn \
   gns \
+  zonemaster \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \
-  integration-tests \
-  $(EXP_DIR)
+  secretsharing \
+	$(EXP_DIR) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+  integration-tests 
 
 endif