- ttl is deprecated, don't warn

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

diff --git a/src/Makefile.am b/src/Makefile.am
index dd8777c912f2a981b5aafa1a0269412e0f3bc9da..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,10 +8,7 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
  SENSOR = sensor
- PEERSTORE = peerstore
  SENSORDASHBOARD = sensordashboard
 endif
 
@@ -21,17 +19,14 @@ if HAVE_EXPERIMENTAL
   env \
   psycstore \
   psyc \
+  rps \
   social \
   $(CONSENSUS) \
   $(SECRETSHARING) \
-  $(SCALARPRODUCT) \
-  $(EXPERIMENTATION) \
-  $(PEERSTORE) \
   $(SENSOR) \
   $(SENSORDASHBOARD)
 endif
 
-
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
 else
@@ -44,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 \
@@ -60,6 +59,7 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
+  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -81,6 +81,7 @@ SUBDIRS = \
   dns \
   identity \
   set \
+  scalarproduct \
   revocation \
   gnsrecord \
   namecache \
@@ -88,6 +89,7 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
+  peerstore \
   fs \
   exit \
   pt \