- merge with master

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 8746a47e25a540143ef3f5b51e872112d42af664..4a1d909eda9c4420c3037e964b3b13b5f1467dbc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,43 +1,80 @@
+# This Makefile.am is in the public domain
 #if WANT_FRAMEWORK
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
 if HAVE_TESTING
  TESTING = testing
- TESTBED = testbed
- CONSENSUS = consensus
- EXPERIMENTATION = experimentation
- SCALARPRODUCT = scalarproduct
+ TESTBED = testbed-logger testbed
+ ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  multicast \
-  env \
-  psyc \
-  $(CONSENSUS) \
-  $(EXPERIMENTATION)
-  # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+  dv \
+  rps
 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 HAVE_PULSE
-if HAVE_OPUS
-  CONVERSATION_DIR = conversation
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
 endif
 
+if HAVE_SQLITE
+ SQLITE_DIR = sq
+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 \
@@ -45,6 +82,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   peerinfo \
+  $(SQLITE_DIR) \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
   datacache \
@@ -52,31 +90,47 @@ SUBDIRS = \
   template \
   ats \
   nat \
+  nat-auto \
   fragmentation \
   transport \
   ats-tool \
   peerinfo-tool \
   core \
   $(TESTBED) \
-  ats-tests \
+  $(ATS_TESTS) \
   nse \
   dht \
   hostlist \
   topology \
   regex \
-  mesh \
   dns \
   identity \
+  gnsrecord \
+  namecache \
+  namestore \
+  peerstore \
+  cadet \
   set \
-  dv \
+  consensus \
+  scalarproduct \
   revocation \
-  namestore \
   vpn \
   gns \
+       credential \
+  zonemaster \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \
+  secretsharing \
   integration-tests \
-  $(EXP_DIR) 
+  multicast \
+  psycutil \
+  psycstore \
+  psyc \
+  social \
+  $(AUCTION_DIR) \
+  $(EXP_DIR) \
+  $(PROVIDER_DIR)
+
+endif