-allow 'years' in time units, indentation and doxygen fixes

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8efb7afe65fc0d84e461cb2acdad86c50c4c22f4..8e3d02993f389b4c92656652c9f5311545f7d8e6 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,8 +8,6 @@ if HAVE_TESTING
  TESTBED = testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
- EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
  SENSOR = sensor
  SENSORDASHBOARD = sensordashboard
 endif
@@ -24,13 +23,10 @@ if HAVE_EXPERIMENTAL
   social \
   $(CONSENSUS) \
   $(SECRETSHARING) \
-  $(SCALARPRODUCT) \
-  $(EXPERIMENTATION) \
   $(SENSOR) \
   $(SENSORDASHBOARD)
 endif
 
-
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
 else
@@ -47,6 +43,16 @@ if HAVE_POSTGRESQL
  POSTGRES_DIR = postgres
 endif
 
+if HAVE_REST
+ REST_DIR = rest
+endif
+
+if TALER_ONLY
+SUBDIRS = \
+ include \
+ util
+else
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -59,6 +65,7 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
+  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -80,6 +87,7 @@ SUBDIRS = \
   dns \
   identity \
   set \
+  scalarproduct \
   revocation \
   gnsrecord \
   namecache \
@@ -93,3 +101,5 @@ SUBDIRS = \
   pt \
   integration-tests \
   $(EXP_DIR)
+
+endif