REST/NAMESTORE: rework API

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 56f301ac026a4d0f1727d759d45286732ddc5b23..ab8731fc27354c1756aefd6f2ae935f0213a2606 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,23 +6,20 @@
 if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed-logger testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
  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
-if HAVE_MHD
-  PROVIDER_DIR = identity-provider
+ EXP_DIR += \
+  auction
 endif
 endif
 
@@ -45,24 +42,24 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+endif
+
 if HAVE_MYSQL
  MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = pq postgres
+ POSTGRES_DIR = pq
 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,21 +70,23 @@ 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) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
@@ -105,12 +104,11 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
-  peerstore \
   cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -120,14 +118,10 @@ SUBDIRS = \
   fs \
   exit \
   pt \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
+  secretsharing \
+  reclaim-attribute \
+  reclaim \
   $(EXP_DIR) \
-  $(PROVIDER_DIR)
+  integration-tests
 
 endif