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 06b2aedc47c2cb9b3c85acf90b38b879c0d51bb4..08693ec026cebf859923c6442af13bec66531f73 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,19 +2,43 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
+if HAVE_TESTING
+ TESTING = testing
+ TESTBED = testbed
+ CONSENSUS = consensus
+# SECRETSHARING = secretsharing
+ EXPERIMENTATION = experimentation
+endif
+
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv stream
+ 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 gns exit vpn pt
+
+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) \
@@ -24,25 +48,40 @@ SUBDIRS = \
   block \
   statistics \
   arm \
+  $(TESTING) \
   peerinfo \
   $(MYSQL_DIR) \
+  $(POSTGRES_DIR) \
   datacache \
   datastore \
-  namestore \
   template \
   ats \
   nat \
   fragmentation \
   transport \
+  ats-tool \
   peerinfo-tool \
   core \
-  testing \
+  $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
-  fs \
+  regex \
   mesh \
-  $(LINUX_DIR) \
+  dns \
+  identity \
+  set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
+  fs \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)