- ttl is deprecated, don't warn

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 94345a5bd284a6c1994976f631b50cd2b70ffef3..ae623bddc73d8ac2aa41b90695efe3ff7f5bdab7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 #if WANT_FRAMEWORK
 #  INTLEMU_SUBDIRS = intlemu
 #endif
@@ -7,26 +8,30 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- EXPERIMENTATION = experimentation
+ SENSOR = sensor
+ SENSORDASHBOARD = sensordashboard
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  scalarproduct \
   multicast \
   env \
   psycstore \
   psyc \
+  rps \
+  social \
   $(CONSENSUS) \
   $(SECRETSHARING) \
-  $(EXPERIMENTATION)
+  $(SENSOR) \
+  $(SENSORDASHBOARD)
 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
 
@@ -34,10 +39,14 @@ if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
  POSTGRES_DIR = postgres
 endif
 
+if HAVE_REST
+ REST_DIR = rest
+endif
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -50,6 +59,7 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
+  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -67,10 +77,11 @@ SUBDIRS = \
   hostlist \
   topology \
   regex \
-  mesh \
+  cadet \
   dns \
   identity \
   set \
+  scalarproduct \
   revocation \
   gnsrecord \
   namecache \
@@ -78,6 +89,7 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
+  peerstore \
   fs \
   exit \
   pt \