cmdline usability for gnunet-social

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 47d6896cbcf0b8766c868e93bb1b3d3c6faf1289..5582c178b3a89d28c900a4e2b429ba0441cba626 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,31 +8,32 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
   rps \
-  social \
   $(CONSENSUS) \
-  $(SECRETSHARING) \
-  $(SENSOR) \
-  $(SENSORDASHBOARD)
+  $(SECRETSHARING)
+
 endif
 
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
   PROVIDER_DIR = identity-provider
 endif
+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
@@ -51,8 +52,11 @@ if HAVE_POSTGRESQL
  POSTGRES_DIR = pq postgres
 endif
 
-if HAVE_REST
+if HAVE_MHD
  REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
 endif
 
 if TALER_ONLY
@@ -66,6 +70,7 @@ SUBDIRS = \
   util \
   $(JSON_DIR) \
   $(REST_DIR) \
+       $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -109,6 +114,11 @@ SUBDIRS = \
   exit \
   pt \
   integration-tests \
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
   $(EXP_DIR) \
   $(PROVIDER_DIR)