Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 21d4ee8187cfdd869a33d298cbadc6348d4a7d36..d8d5487066c4ab969753104ea86e183e2e1a35dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,13 +11,23 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
-  rps
+  rps \
+  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
 
@@ -40,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
@@ -55,9 +69,6 @@ if HAVE_JSON
 endif
 endif
 
-if HAVE_JSON
-  AUCTION_DIR = auction
-endif
 
 if TALER_ONLY
 SUBDIRS = \
@@ -78,6 +89,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -118,13 +130,6 @@ SUBDIRS = \
   pt \
   secretsharing \
   integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
-  $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  $(EXP_DIR)
 
 endif