- build rest before jsonapi

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e3d02993f389b4c92656652c9f5311545f7d8e6..946711797428c3ed525983478ca1225a9a92656a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,23 +8,30 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  multicast \
-  env \
-  psycstore \
-  psyc \
   rps \
-  social \
   $(CONSENSUS) \
-  $(SECRETSHARING) \
-  $(SENSOR) \
-  $(SENSORDASHBOARD)
+  $(SECRETSHARING)
+
+endif
+
+if HAVE_REST
+  PROVIDER_DIR = identity-provider
+endif
+
+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
@@ -40,11 +47,14 @@ if HAVE_MYSQL
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = postgres
+ POSTGRES_DIR = pq postgres
 endif
 
 if HAVE_REST
  REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
 endif
 
 if TALER_ONLY
@@ -56,6 +66,9 @@ else
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+       $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -65,7 +78,6 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
-  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -100,6 +112,12 @@ SUBDIRS = \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR)
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
+  $(EXP_DIR) \
+  $(PROVIDER_DIR)
 
 endif