add option to create identity from private key

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ae328f9a253771fea1e039bd572689b0f44d084..446b1aa2a35e27ca99507c15029c9b92609cdc57 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,29 +12,17 @@ endif
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps \
-  credential
+  abd
 if HAVE_ABE
  EXP_DIR += \
   abe
 endif
-if HAVE_JSON
  EXP_DIR += \
   auction
 endif
-endif
 
-if HAVE_MHD
-if HAVE_JSON
-  JSON_DIR = json
-if HAVE_LIBGNURL
-  JSON_DIR += curl
-else
-if HAVE_LIBCURL
-  JSON_DIR += curl
-endif
-endif
-endif
-endif
+JSON_DIR = json
+CURL_DIR = curl
 
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
@@ -56,18 +44,8 @@ if HAVE_POSTGRESQL
  POSTGRES_DIR = pq
 endif
 
-if HAVE_MHD
-if HAVE_JSON
- REST_DIR = rest
-endif
-endif
-
+REST_DIR = rest
 
-if TALER_ONLY
-SUBDIRS = \
- include \
- util
-else
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
@@ -80,6 +58,7 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   $(JSON_DIR) \
+  $(CURL_DIR) \
   $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
@@ -121,9 +100,6 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-  reclaim-attribute \
   reclaim \
   $(EXP_DIR) \
   integration-tests
-
-endif