X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=ab8731fc27354c1756aefd6f2ae935f0213a2606;hb=342619bf17d389e4305c9ee72b609059706a8023;hp=68878b5a013931ebe2f65f67ddc1b0318fa2d777;hpb=d4b252fd73bdda7be51a971ba06a650a1dceb45c;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 68878b5a0..ab8731fc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,14 +11,15 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  rps
+  rps \
+  credential
+if HAVE_ABE
+ EXP_DIR += \
+  abe
 endif
-#  dv (FTBFS)
-
 if HAVE_JSON
-if HAVE_MHD
-  ATTRIBUTE_DIR = identity-attribute
-  PROVIDER_DIR = identity-provider
+ EXP_DIR += \
+  auction
 endif
 endif
 
@@ -54,15 +55,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 = \
@@ -73,15 +70,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) \
@@ -89,6 +86,7 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
@@ -106,10 +104,8 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
-  peerstore \
   cadet \
   set \
   consensus \
@@ -117,22 +113,15 @@ SUBDIRS = \
   revocation \
   vpn \
   gns \
-	credential \
   zonemaster \
   $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
   secretsharing \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
+  reclaim-attribute \
+  reclaim \
   $(EXP_DIR) \
-	$(ATTRIBUTE_DIR) \
-  $(PROVIDER_DIR)
+  integration-tests
 
 endif