-fix double free, linker issue

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

diff --git a/src/Makefile.am b/src/Makefile.am
index eb4049285d9150cda1e4e8e5dd03721347a401c3..2ece564fd33722221d4b15de219dec250e5bba7b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,19 +3,41 @@
 #endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv 
+ EXP_DIR = chat dv stream 
 endif
 
+if LINUX
+# All of these currently only work on GNU/Linux
+ LINUX_DIR = dns exit vpn gns pt
+endif
+if MINGW
+ MINGW_DIR = dns vpn gns
+endif
+
+if HAVE_MYSQL
+ MYSQL_DIR = mysql
+endif
+
+if HAVE_POSTGRES
+ POSTGRES_DIR = postgres
+endif
+
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
   hello \
+  tun \
   block \
   statistics \
   arm \
+  testing \
   peerinfo \
+  $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
   datastore \
+  namestore \
   template \
   ats \
   nat \
@@ -23,13 +45,17 @@ SUBDIRS = \
   transport \
   peerinfo-tool \
   core \
-  testing \
+  testbed \
+  testing_old \
   nse \
   dht \
   hostlist \
   topology \
   fs \
+  regex \
   mesh \
-  vpn \
+  lockmanager \
+  $(LINUX_DIR) \
+  $(MINGW_DIR) \
   integration-tests \
   $(EXP_DIR)