-ignore

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 97b643f5c59a66e590efece3cb2cc2f25642d922..e339abf6d34aa278bf40bfa6379381452f07250e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,8 +6,11 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
  SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
+ PEERSTORE = peerstore
 endif
 
 if HAVE_EXPERIMENTAL
@@ -15,16 +18,24 @@ if HAVE_EXPERIMENTAL
   dv \
   multicast \
   env \
+  psycstore \
   psyc \
+  social \
   $(CONSENSUS) \
-  $(EXPERIMENTATION)
-  # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
-if HAVE_PULSE
-if HAVE_OPUS
-  EXP_DIR += conversation
-endif
+  $(SECRETSHARING) \
+  $(SCALARPRODUCT) \
+  $(EXPERIMENTATION) \
+  $(SENSOR) \
+  $(PEERSTORE)
 endif
 
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
 endif
 
 if HAVE_MYSQL
@@ -64,18 +75,19 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
-  mesh \
-  lockmanager \
+  cadet \
   dns \
   identity \
   set \
   revocation \
+  gnsrecord \
+  namecache \
   namestore \
   vpn \
   gns \
-  psycstore \
+  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) 
+  $(EXP_DIR)