continue to fix extract result

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 79730b0bb544f20604935e0144c721e571a6c292..5582c178b3a89d28c900a4e2b429ba0441cba626 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,28 +8,32 @@ 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_WACHS
-  WACHS_DIR = \
-    ats-tests
+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
@@ -45,16 +49,28 @@ if HAVE_MYSQL
 endif
 
 if HAVE_POSTGRESQL
- POSTGRES_DIR = postgres
+ 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
+SUBDIRS = \
+ include \
+ util
+else
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+       $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -64,7 +80,6 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
-  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -76,6 +91,7 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
@@ -98,5 +114,12 @@ SUBDIRS = \
   exit \
   pt \
   integration-tests \
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
   $(EXP_DIR) \
-  $(WACHS_DIR)
+  $(PROVIDER_DIR)
+
+endif