-fix double free, linker issue

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 94092e1a8f899e808bd04d862f9a8a41454e21a3..2ece564fd33722221d4b15de219dec250e5bba7b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,25 +2,60 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if !MINGW
- NAT_DIR = nat
+if HAVE_EXPERIMENTAL
+ 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 \
-  hello \
+  testing \
   peerinfo \
+  $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
   datastore \
+  namestore \
   template \
+  ats \
+  nat \
+  fragmentation \
   transport \
   peerinfo-tool \
   core \
-  testing \
+  testbed \
+  testing_old \
+  nse \
+  dht \
   hostlist \
   topology \
-  $(NAT_DIR) \
-  fs
+  fs \
+  regex \
+  mesh \
+  lockmanager \
+  $(LINUX_DIR) \
+  $(MINGW_DIR) \
+  integration-tests \
+  $(EXP_DIR)