Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d0284157027399efe76392da01a661546ce48cb..c1c708aa6ecb02e4375cf37d45b84af0a7ef6420 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,12 +12,18 @@ endif
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps
-#  dv (FTBFS)
 if HAVE_ABE
-  EXP_DIR += abe \
-                                                credential \
-                  identity-attribute \
-                                                identity-provider 
+if HAVE_JSON
+ EXP_DIR += \
+    abe \
+    credential \
+    reclaim-attribute \
+    reclaim
+endif
+endif
+if HAVE_JSON
+ EXP_DIR += \
+    auction
 endif
 endif
 
@@ -53,15 +59,11 @@ if HAVE_POSTGRESQL
 endif
 
 if HAVE_MHD
- REST_DIR = rest
 if HAVE_JSON
- JSONAPI_DIR = jsonapi
+ REST_DIR = rest
 endif
 endif
 
-if HAVE_JSON
-  AUCTION_DIR = auction
-endif
 
 if TALER_ONLY
 SUBDIRS = \
@@ -72,15 +74,15 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-  $(JSON_DIR) \
-  $(REST_DIR) \
-  $(JSONAPI_DIR) \
+  nt \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -88,6 +90,7 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
@@ -105,10 +108,8 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
-  peerstore \
   cadet \
   set \
   consensus \
@@ -122,13 +123,7 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
-  $(EXP_DIR)
+  $(EXP_DIR) \
+  integration-tests
 
 endif