-ignore

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

diff --git a/src/Makefile.am b/src/Makefile.am
index dcaedc1e8fd90ab425ac8aed880463740e93006b..e339abf6d34aa278bf40bfa6379381452f07250e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,24 +8,33 @@ if HAVE_TESTING
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
+ SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
+ PEERSTORE = peerstore
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
+  social \
   $(CONSENSUS) \
   $(SECRETSHARING) \
-  $(EXPERIMENTATION)
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION) \
+  $(SENSOR) \
+  $(PEERSTORE)
 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
 
@@ -66,7 +75,7 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
-  mesh \
+  cadet \
   dns \
   identity \
   set \
@@ -77,7 +86,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \