add attestation API

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 217aea54f718c4d5f4d57082d3561cf1c49b83d4..7b73a4bb8f686ed8250bdc2d77c28127758d5235 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ endif
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps \
-  credential
+  abd
 if HAVE_ABE
  EXP_DIR += \
   abe
@@ -23,16 +23,24 @@ if HAVE_JSON
 endif
 endif
 
-if HAVE_MHD
 if HAVE_JSON
+if HAVE_MHD
   JSON_DIR = json
+endif
+endif
 if HAVE_LIBGNURL
-  JSON_DIR += curl
+  CURL_DIR = curl
 else
 if HAVE_LIBCURL
-  JSON_DIR += curl
+  CURL_DIR = curl
 endif
 endif
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
 endif
 
@@ -51,17 +59,13 @@ endif
 if HAVE_MHD
 if HAVE_JSON
  REST_DIR = rest
- RECLAIM_DIR = reclaim-attribute reclaim
+ RECLAIM_DIR = \
+  reclaim-attribute \
+  reclaim
 endif
 endif
 
 
-if TALER_ONLY
-SUBDIRS = \
- include \
- util
-else
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -73,6 +77,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   $(JSON_DIR) \
+  $(CURL_DIR) \
   $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
@@ -109,7 +114,7 @@ SUBDIRS = \
   vpn \
   gns \
   zonemaster \
-  conversation \
+  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
@@ -117,5 +122,3 @@ SUBDIRS = \
   $(RECLAIM_DIR) \
   $(EXP_DIR) \
   integration-tests
-
-endif