another special case for loopback

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 5244c795d1ee721613a74169dec3d2ab83f2a286..56f301ac026a4d0f1727d759d45286732ddc5b23 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,10 @@
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
+ TESTBED = testbed-logger testbed
  CONSENSUS = consensus
  SECRETSHARING = secretsharing
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
@@ -16,11 +17,14 @@ if HAVE_EXPERIMENTAL
   rps \
   $(CONSENSUS) \
   $(SECRETSHARING)
+
 endif
 
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
   PROVIDER_DIR = identity-provider
 endif
+endif
 
 if HAVE_JSON
   JSON_DIR = json
@@ -42,15 +46,22 @@ endif
 endif
 
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
  POSTGRES_DIR = pq postgres
 endif
 
-if HAVE_REST
+if HAVE_MHD
  REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
+endif
+
+if HAVE_JSON
+  AUCTION_DIR = auction
 endif
 
 if TALER_ONLY
@@ -64,6 +75,7 @@ SUBDIRS = \
   util \
   $(JSON_DIR) \
   $(REST_DIR) \
+  $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -78,31 +90,33 @@ SUBDIRS = \
   template \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  cadet \
   dns \
   identity \
-  set \
-  scalarproduct \
-  revocation \
   gnsrecord \
   namecache \
   namestore \
+  peerstore \
+  cadet \
+  set \
+  scalarproduct \
+  revocation \
   vpn \
   gns \
+  zonemaster \
   $(CONVERSATION_DIR) \
-  peerstore \
   fs \
   exit \
   pt \
@@ -112,6 +126,7 @@ SUBDIRS = \
   psycstore \
   psyc \
   social \
+  $(AUCTION_DIR) \
   $(EXP_DIR) \
   $(PROVIDER_DIR)