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 6d0284157027399efe76392da01a661546ce48cb..446b1aa2a35e27ca99507c15029c9b92609cdc57 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,26 +11,18 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  rps
-#  dv (FTBFS)
+  rps \
+  abd
 if HAVE_ABE
-  EXP_DIR += abe \
-                                                credential \
-                  identity-attribute \
-                                                identity-provider 
+ EXP_DIR += \
+  abe
 endif
+ EXP_DIR += \
+  auction
 endif
 
-if HAVE_JSON
-  JSON_DIR = json
-if HAVE_LIBGNURL
-  JSON_DIR += curl
-else
-if HAVE_LIBCURL
-  JSON_DIR += curl
-endif
-endif
-endif
+JSON_DIR = json
+CURL_DIR = curl
 
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
@@ -52,35 +44,22 @@ if HAVE_POSTGRESQL
  POSTGRES_DIR = pq
 endif
 
-if HAVE_MHD
- REST_DIR = rest
-if HAVE_JSON
- JSONAPI_DIR = jsonapi
-endif
-endif
-
-if HAVE_JSON
-  AUCTION_DIR = auction
-endif
+REST_DIR = rest
 
-if TALER_ONLY
-SUBDIRS = \
- include \
- util
-else
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
-  $(JSON_DIR) \
-  $(REST_DIR) \
-  $(JSONAPI_DIR) \
+  nt \
+  gnsrecord \
   hello \
-  tun \
   block \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(CURL_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -88,6 +67,7 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
@@ -105,10 +85,8 @@ SUBDIRS = \
   regex \
   dns \
   identity \
-  gnsrecord \
   namecache \
   namestore \
-  peerstore \
   cadet \
   set \
   consensus \
@@ -122,13 +100,6 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-  integration-tests \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social \
-  $(AUCTION_DIR) \
-  $(EXP_DIR)
-
-endif
+  reclaim \
+  $(EXP_DIR) \
+  integration-tests