Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index c2e6fd64ec24f13b9d2fb8ea1d1f05e285576d02..d8d5487066c4ab969753104ea86e183e2e1a35dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,22 +5,30 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   rps \
-  $(CONSENSUS) \
-  $(SECRETSHARING)
-
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social 
+#  dv (FTBFS)
+if HAVE_ABE
+ EXP_DIR += \
+    abe \
+    credential \
+    identity-attribute \
+    identity-provider 
+endif
+if HAVE_JSON
+ EXP_DIR += \
+    auction
 endif
-
-if HAVE_REST
-  PROVIDER_DIR = identity-provider
 endif
 
 if HAVE_JSON
@@ -42,21 +50,26 @@ 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 = pq postgres
+ POSTGRES_DIR = pq
 endif
 
-if HAVE_REST
+if HAVE_MHD
  REST_DIR = rest
 if HAVE_JSON
  JSONAPI_DIR = jsonapi
 endif
 endif
 
+
 if TALER_ONLY
 SUBDIRS = \
  include \
@@ -67,8 +80,8 @@ SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
   $(JSON_DIR) \
-       $(JSONAPI_DIR) \
   $(REST_DIR) \
+  $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -76,6 +89,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -83,41 +97,39 @@ 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 \
-  set \
-  scalarproduct \
-  revocation \
   gnsrecord \
   namecache \
   namestore \
+  peerstore \
+  cadet \
+  set \
+  consensus \
+  scalarproduct \
+  revocation \
   vpn \
   gns \
+  zonemaster \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \
+  secretsharing \
   integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  $(EXP_DIR)
 
 endif