WIP commit of scalar product 2.0. It is unfinished and does not yet pass tests. This...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 20344e29ccd73607351ea4ae63727a5baf25e84c..4b63933b82e20a5e854a38c32232429a0eaff404 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,13 +6,35 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
  SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
+ PEERSTORE = peerstore
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv multicast $(CONSENSUS) $(EXPERIMENTATION) 
-#note: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+ EXP_DIR = \
+  dv \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(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
@@ -23,7 +45,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -47,23 +68,25 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  revocation \
+  gnsrecord \
+  namecache \
   namestore \
   vpn \
   gns \
-  psycstore \
+  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) 
-
+  $(EXP_DIR)