fix compiler warnings

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

diff --git a/src/Makefile.am b/src/Makefile.am
index c2e6fd64ec24f13b9d2fb8ea1d1f05e285576d02..98ca70ae3254aaac9fbf570cdc26c06ac3a59e1f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
+ TESTBED = testbed-logger testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
 endif
@@ -19,9 +19,11 @@ if HAVE_EXPERIMENTAL
 
 endif
 
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
   PROVIDER_DIR = identity-provider
 endif
+endif
 
 if HAVE_JSON
   JSON_DIR = json
@@ -43,14 +45,14 @@ endif
 endif
 
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
  POSTGRES_DIR = pq postgres
 endif
 
-if HAVE_REST
+if HAVE_MHD
  REST_DIR = rest
 if HAVE_JSON
  JSONAPI_DIR = jsonapi
@@ -67,8 +69,8 @@ SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
   $(JSON_DIR) \
-       $(JSONAPI_DIR) \
   $(REST_DIR) \
+  $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -95,19 +97,19 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
-  cadet \
   dns \
   identity \
-  set \
-  scalarproduct \
-  revocation \
   gnsrecord \
   namecache \
   namestore \
+  peerstore \
+  cadet \
+  set \
+  scalarproduct \
+  revocation \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \