REST/NAMESTORE: rework API

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ffb39260cf068e807bb4a0c1c8c0bf0dbca7e3a0..ab8731fc27354c1756aefd6f2ae935f0213a2606 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,24 +12,14 @@ endif
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social
-#  dv (FTBFS)
+  credential
 if HAVE_ABE
-if HAVE_JSON
  EXP_DIR += \
-    abe \
-    credential \
-    reclaim-attribute \
-    reclaim
-endif
+  abe
 endif
 if HAVE_JSON
  EXP_DIR += \
-    auction
+  auction
 endif
 endif
 
@@ -66,7 +56,7 @@ endif
 
 if HAVE_MHD
 if HAVE_JSON
- REST_DIR = rest rest-plugins
+ REST_DIR = rest
 endif
 endif
 
@@ -87,6 +77,8 @@ SUBDIRS = \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -94,11 +86,11 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
   fragmentation \
-  peerstore \
   transport \
   ats-tool \
   peerinfo-tool \
@@ -127,9 +119,9 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
+  reclaim-attribute \
+  reclaim \
+  $(EXP_DIR) \
   integration-tests
 
 endif