X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=9796f037666d2a9084c2497775c95765a0949d5f;hb=852078ede997226aa93814537cff282d4a1bc1be;hp=dcaedc1e8fd90ab425ac8aed880463740e93006b;hpb=7df25e6e27fd04a7e958fb4edeee3ae1ae6e1c15;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index dcaedc1e8..9796f0376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,24 +8,28 @@ if HAVE_TESTING
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
   $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
   $(EXPERIMENTATION)
 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
 
@@ -77,7 +81,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \