continue to fix extract result

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 83648ded2b88483bae74699e321b3ffc1ffae7a8..5582c178b3a89d28c900a4e2b429ba0441cba626 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,25 +8,33 @@ 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_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
 CONVERSATION_DIR = conversation
@@ -41,12 +49,28 @@ if HAVE_MYSQL
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = postgres
+ POSTGRES_DIR = pq postgres
 endif
 
+if HAVE_MHD
+ REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
+endif
+
+if TALER_ONLY
+SUBDIRS = \
+ include \
+ util
+else
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+       $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -90,4 +114,12 @@ SUBDIRS = \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR)
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
+  $(EXP_DIR) \
+  $(PROVIDER_DIR)
+
+endif