fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ac08a16a9114ea548da2e800bab9a7646c120b24..08693ec026cebf859923c6442af13bec66531f73 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,33 +2,86 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+# SECRETSHARING = secretsharing
+ EXPERIMENTATION = experimentation
+endif
+
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat
+ EXP_DIR = \
+  dv \
+  scalarproduct \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(EXPERIMENTATION)
+endif
+
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+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 \
+  $(TESTING) \
   peerinfo \
+  $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
   datastore \
   template \
+  ats \
   nat \
   fragmentation \
   transport \
+  ats-tool \
   peerinfo-tool \
   core \
-  testing \
+  $(TESTBED) \
+  ats-tests \
   nse \
-  dv \
   dht \
   hostlist \
   topology \
-  fs \
+  regex \
   mesh \
+  dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
   vpn \
-  $(EXP_DIR) 
+  gns \
+  $(CONVERSATION_DIR) \
+  fs \
+  exit \
+  pt \
+  integration-tests \
+  $(EXP_DIR)