Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index d04cba9dd0a6c229ea54e092a38f962623292beb..d8d5487066c4ab969753104ea86e183e2e1a35dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,22 +6,28 @@
 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
+ EXP_DIR += \
+    abe \
+    credential \
+    identity-attribute \
+    identity-provider 
 endif
-
 if HAVE_JSON
-if HAVE_MHD
-  PROVIDER_DIR = identity-provider
+ EXP_DIR += \
+    auction
 endif
 endif
 
@@ -44,12 +50,16 @@ 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
@@ -59,6 +69,7 @@ if HAVE_JSON
 endif
 endif
 
+
 if TALER_ONLY
 SUBDIRS = \
  include \
@@ -78,6 +89,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -92,7 +104,7 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
@@ -106,6 +118,7 @@ SUBDIRS = \
   peerstore \
   cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -115,13 +128,8 @@ SUBDIRS = \
   fs \
   exit \
   pt \
+  secretsharing \
   integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  $(EXP_DIR)
 
 endif