fix compiler warnings

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 902c3290bb9ce6540a918381b43ac15dac6a5821..98ca70ae3254aaac9fbf570cdc26c06ac3a59e1f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,34 +1,40 @@
+# This Makefile.am is in the public domain
 #if WANT_FRAMEWORK
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
+ TESTBED = testbed-logger testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
- SENSOR = sensor
- SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  multicast \
-  env \
-  psycstore \
-  psyc \
-  social \
+  rps \
   $(CONSENSUS) \
-  $(SECRETSHARING) \
-  $(SCALARPRODUCT) \
-  $(EXPERIMENTATION) \
-  $(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
@@ -39,16 +45,32 @@ endif
 endif
 
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
-if HAVE_POSTGRES
- POSTGRES_DIR = postgres
+if HAVE_POSTGRESQL
+ 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 \
@@ -75,20 +97,29 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
-  cadet \
   dns \
   identity \
-  set \
-  revocation \
   gnsrecord \
   namecache \
   namestore \
+  peerstore \
+  cadet \
+  set \
+  scalarproduct \
+  revocation \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR)
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
+  $(EXP_DIR) \
+  $(PROVIDER_DIR)
+
+endif