1 files changed, 9 insertions, 10 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 61e96c75b..54f6dfab2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,18 +16,20 @@ if HAVE_EXPERIMENTAL
   psycutil \
   psycstore \
   psyc \
-  social 
+  social
 #  dv (FTBFS)
 if HAVE_ABE
+if HAVE_JSON
  EXP_DIR += \
     abe \
     credential \
-    identity-attribute \
-    identity-provider
+    reclaim-attribute \
+    reclaim
 if HAVE_ZKLAIM
   EXP_DIR += zklaim
 endif
 endif
+endif
 if HAVE_JSON
  EXP_DIR += \
     auction
@@ -66,9 +68,8 @@ if HAVE_POSTGRESQL
 endif
 
 if HAVE_MHD
- REST_DIR = rest
 if HAVE_JSON
- JSONAPI_DIR = jsonapi
+ REST_DIR = rest jsonapi rest-plugins
 endif
 endif
 
@@ -82,11 +83,8 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-  $(JSON_DIR) \
-  $(REST_DIR) \
-  $(JSONAPI_DIR) \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
@@ -115,7 +113,6 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
   peerstore \
@@ -132,6 +129,8 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   integration-tests \
   $(EXP_DIR)