changed testbed API to include convenience callbacks

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f10a51b7a54bd22998d6d93ba47f21bbc72f5a8..580a645ff6a349acdd3a021b8c1a7b93a0a528f0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,15 @@
 #endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv stream regex
+ EXP_DIR = chat dv stream 
 endif
 
 if LINUX
 # All of these currently only work on GNU/Linux
- LINUX_DIR = dns gns exit vpn pt
+ LINUX_DIR = dns exit vpn gns pt
+endif
+if MINGW
+ MINGW_DIR = dns vpn gns
 endif
 
 if HAVE_MYSQL
@@ -28,7 +31,8 @@ SUBDIRS = \
   block \
   statistics \
   arm \
-  lockmanager \
+  testing \
+  testbed \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
@@ -42,13 +46,16 @@ SUBDIRS = \
   transport \
   peerinfo-tool \
   core \
-  testing \
+  testing_old \
   nse \
   dht \
   hostlist \
   topology \
   fs \
+  regex \
   mesh \
+  lockmanager \
   $(LINUX_DIR) \
+  $(MINGW_DIR) \
   integration-tests \
   $(EXP_DIR)