REST/NAMESTORE: rework API

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

diff --git a/src/Makefile.am b/src/Makefile.am
index edfbb6922f9292a88bb034444276145a5cbeca4c..ab8731fc27354c1756aefd6f2ae935f0213a2606 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,30 +5,33 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
   rps \
-  social \
-       $(CONSENSUS) \
-  $(SECRETSHARING) \
-  $(SENSOR) \
-  $(SENSORDASHBOARD)
+  credential
+if HAVE_ABE
+ EXP_DIR += \
+  abe
+endif
+if HAVE_JSON
+ EXP_DIR += \
+  auction
+endif
 endif
 
-if HAVE_REST
-       EXP_DIR += identity-provider
+if HAVE_JSON
+  JSON_DIR = json
+if HAVE_LIBGNURL
+  JSON_DIR += curl
+else
+if HAVE_LIBCURL
+  JSON_DIR += curl
+endif
+endif
 endif
 
 if BUILD_PULSE_HELPERS
@@ -39,17 +42,24 @@ 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
+if HAVE_MHD
+if HAVE_JSON
  REST_DIR = rest
 endif
+endif
+
 
 if TALER_ONLY
 SUBDIRS = \
@@ -60,50 +70,58 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-       $(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 \
-  $(EXP_DIR)
+  secretsharing \
+  reclaim-attribute \
+  reclaim \
+  $(EXP_DIR) \
+  integration-tests
 
 endif