fix indentation, typo, improve logging

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

diff --git a/src/Makefile.am b/src/Makefile.am
index d8d3fbf572bb4a677e84d7beb011c046e78fae39..56f301ac026a4d0f1727d759d45286732ddc5b23 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,40 +1,81 @@
+# This Makefile.am is in the public domain
 #if WANT_FRAMEWORK
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
+ TESTBED = testbed-logger testbed
  CONSENSUS = consensus
- EXPERIMENTATION = experimentation
+ SECRETSHARING = secretsharing
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
+ EXP_DIR = \
+  dv \
+  rps \
+  $(CONSENSUS) \
+  $(SECRETSHARING)
+
+endif
+
+if HAVE_JSON
+if HAVE_MHD
+  PROVIDER_DIR = identity-provider
+endif
+endif
+
+if HAVE_JSON
+  JSON_DIR = json
+if HAVE_LIBGNURL
+  JSON_DIR += curl
+else
+if HAVE_LIBCURL
+  JSON_DIR += curl
+endif
+endif
 endif
 
-if LINUX
-# All of these currently only work on GNU/Linux or W32
- LINUX_DIR = exit vpn
-# pt # without namestore, pt currently has some issues...
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = vpn exit 
-# pt # without namestore, pt currently has some issues...
 endif
 
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
-if HAVE_POSTGRES
- POSTGRES_DIR = postgres
+if HAVE_POSTGRESQL
+ POSTGRES_DIR = pq postgres
 endif
 
+if HAVE_MHD
+ REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
+endif
+
+if HAVE_JSON
+  AUCTION_DIR = auction
+endif
+
+if TALER_ONLY
+SUBDIRS = \
+ include \
+ util
+else
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+  $(JSON_DIR) \
+  $(REST_DIR) \
+  $(JSONAPI_DIR) \
   hello \
   tun \
   block \
@@ -49,26 +90,44 @@ SUBDIRS = \
   template \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  mesh \
-  lockmanager \
   dns \
   identity \
+  gnsrecord \
+  namecache \
+  namestore \
+  peerstore \
+  cadet \
   set \
+  scalarproduct \
+  revocation \
+  vpn \
+  gns \
+  zonemaster \
+  $(CONVERSATION_DIR) \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
+  $(AUCTION_DIR) \
+  $(EXP_DIR) \
+  $(PROVIDER_DIR)
 
-# note: namestore, gns are not listed right now as they are being reworked to use the new crypto
\ No newline at end of file
+endif