-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 94419d3270abc8010f89e1a74944d8c7bf772b5e..8e3d02993f389b4c92656652c9f5311545f7d8e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,12 +24,7 @@ if HAVE_EXPERIMENTAL
   $(CONSENSUS) \
   $(SECRETSHARING) \
   $(SENSOR) \
-  $(SENSORDASHBOARD) \
-endif
-
-if HAVE_WACHS
-  WACHS_DIR = \
-    ats-tests
+  $(SENSORDASHBOARD)
 endif
 
 if BUILD_PULSE_HELPERS
@@ -48,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 \
@@ -60,6 +65,7 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
+  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -71,6 +77,7 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
@@ -93,5 +100,6 @@ SUBDIRS = \
   exit \
   pt \
   integration-tests \
-  $(EXP_DIR) \
-  $(WACHS_DIR)
+  $(EXP_DIR)
+
+endif