Merge branch 'master' of git+ssh://gnunet.org/gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 39731b288ec559a92a57a5b8b40a8c185f2e981b..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
@@ -70,7 +70,7 @@ SUBDIRS = \
   util \
   $(JSON_DIR) \
   $(REST_DIR) \
-       $(JSONAPI_DIR) \
+  $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -97,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 \