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

diff --git a/src/Makefile.am b/src/Makefile.am
index c2e6fd64e..ab8731fc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,22 +5,22 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   rps \
-  $(CONSENSUS) \
-  $(SECRETSHARING)
-
+  credential
+if HAVE_ABE
+ EXP_DIR += \
+  abe
+endif
+if HAVE_JSON
+ EXP_DIR += \
+  auction
 endif
-
-if HAVE_REST
-  PROVIDER_DIR = identity-provider
 endif
 
 if HAVE_JSON
@@ -42,21 +42,25 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = pq postgres
+ POSTGRES_DIR = pq
 endif
 
-if HAVE_REST
- REST_DIR = rest
+if HAVE_MHD
 if HAVE_JSON
- JSONAPI_DIR = jsonapi
+ REST_DIR = rest
 endif
 endif
 
+
 if TALER_ONLY
 SUBDIRS = \
  include \
@@ -66,58 +70,58 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-  $(JSON_DIR) \
-	$(JSONAPI_DIR) \
-  $(REST_DIR) \
+  nt \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  cadet \
   dns \
   identity \
+  namecache \
+  namestore \
+  cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
-  gnsrecord \
-  namecache \
-  namestore \
   vpn \
   gns \
+  zonemaster \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
+  secretsharing \
+  reclaim-attribute \
+  reclaim \
   $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  integration-tests
 
 endif