- formatting

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 84fdcc0573883bb2249411bdb2cc8decafe624ab..0aa1ec4d1cdde60cbd29d97959c32356a998ddf5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,9 +12,11 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
+  dv \
   scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
   $(SECRETSHARING) \
@@ -22,9 +24,11 @@ if HAVE_EXPERIMENTAL
 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
 
@@ -69,7 +73,6 @@ SUBDIRS = \
   dns \
   identity \
   set \
-  dv \
   revocation \
   gnsrecord \
   namecache \
@@ -77,7 +80,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \