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 6819ec90b84a491c9b165f16673de914630be373..08693ec026cebf859923c6442af13bec66531f73 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +2,34 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+# SECRETSHARING = secretsharing
+ EXPERIMENTATION = experimentation
+endif
+
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns consensus dv set experimentation
+ EXP_DIR = \
+  dv \
+  scalarproduct \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(EXPERIMENTATION)
 endif
 
-if LINUX
-# All of these currently only work on GNU/Linux
- LINUX_DIR = dns exit vpn pt
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = dns vpn exit
 endif
 
 if HAVE_MYSQL
@@ -22,7 +40,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -31,13 +48,12 @@ SUBDIRS = \
   block \
   statistics \
   arm \
-  testing \
+  $(TESTING) \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
@@ -46,17 +62,26 @@ SUBDIRS = \
   ats-tool \
   peerinfo-tool \
   core \
-  testbed \
+  $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
-  stream \ 
+  dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)