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 99bc77ba2e8bb71ff86a2774a6edd2202083fc55..08693ec026cebf859923c6442af13bec66531f73 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,24 +6,29 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+# SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
+  dv \
+  scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
+  $(SECRETSHARING) \
   $(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
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
 endif
 
@@ -64,10 +69,10 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
+  mesh \
   dns \
   identity \
   set \
-  dv \
   revocation \
   gnsrecord \
   namecache \
@@ -75,7 +80,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \