fix more leaks

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

diff --git a/src/Makefile.am b/src/Makefile.am
index aa143212769fd9e09b3ea3edd4ad43c74d41fa36..8746a47e25a540143ef3f5b51e872112d42af664 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,37 +2,81 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if !MINGW
- NAT_DIR = nat
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+ EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
 endif
 
-if HAVE_ESMTP
-if HAVE_OPENSSL
- MONKEY_DIR = monkey
+if HAVE_EXPERIMENTAL
+ EXP_DIR = \
+  multicast \
+  env \
+  psyc \
+  $(CONSENSUS) \
+  $(EXPERIMENTATION)
+  # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
 endif
+
+
+if HAVE_PULSE
+if HAVE_OPUS
+  CONVERSATION_DIR = conversation
+endif
+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) \
-  hello \
+  $(TESTING) \
   peerinfo \
+  $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
   datastore \
   template \
+  ats \
+  nat \
+  fragmentation \
   transport \
+  ats-tool \
   peerinfo-tool \
   core \
-  dv \
-  testing \
+  $(TESTBED) \
+  ats-tests \
+  nse \
   dht \
   hostlist \
   topology \
-  $(NAT_DIR) \
+  regex \
+  mesh \
+  dns \
+  identity \
+  set \
+  dv \
+  revocation \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
+  psycstore \
   fs \
-  fragmentation \
-  vpn
+  exit \
+  pt \
+  integration-tests \
+  $(EXP_DIR)