X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=8746a47e25a540143ef3f5b51e872112d42af664;hb=73bfdbd5294ec0e4f953e19c766920c0ae3b0737;hp=97b643f5c59a66e590efece3cb2cc2f25642d922;hpb=5b82f1062147ef5da89971d515d93fd4df8cd40d;p=oweals%2Fgnunet.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 97b643f5c..8746a47e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,21 +12,21 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   multicast \
   env \
   psyc \
   $(CONSENSUS) \
   $(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
-  EXP_DIR += conversation
+  CONVERSATION_DIR = conversation
 endif
 endif
 
-endif
-
 if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
@@ -65,14 +65,15 @@ SUBDIRS = \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  dv \
   revocation \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
   psycstore \
   fs \
   exit \