-fix double free, linker issue

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1b88b08d2460a829a001eaf567c194568014ec56..2ece564fd33722221d4b15de219dec250e5bba7b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,39 +2,60 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if HAVE_ESMTP
-if HAVE_OPENSSL
- MONKEY_DIR = monkey
+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 HAVE_EXPERIMENTAL
- DS_exp = datastore
- FS_exp = fs
+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 \
-  $(MONKEY_DIR) \
+  testing \
   peerinfo \
+  $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
-  $(DS_exp) \
+  datastore \
+  namestore \
   template \
+  ats \
   nat \
+  fragmentation \
   transport \
   peerinfo-tool \
   core \
-  testing \
-  dv \
+  testbed \
+  testing_old \
+  nse \
   dht \
   hostlist \
   topology \
-  $(FS_exp) \
-  fragmentation \
+  fs \
+  regex \
   mesh \
-  vpn \
-  chat
+  lockmanager \
+  $(LINUX_DIR) \
+  $(MINGW_DIR) \
+  integration-tests \
+  $(EXP_DIR)