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 18643e5df236917eba9862f1e3434dcbe8c3fd9f..446b1aa2a35e27ca99507c15029c9b92609cdc57 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,37 +12,17 @@ endif
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social 
-#  dv (FTBFS)
+  abd
 if HAVE_ABE
-if HAVE_JSON
  EXP_DIR += \
-    abe \
-    credential \
-    reclaim-attribute \
-    reclaim 
+  abe
 endif
-endif
-if HAVE_JSON
  EXP_DIR += \
-    auction
-endif
+  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
@@ -64,28 +44,22 @@ if HAVE_POSTGRESQL
  POSTGRES_DIR = pq
 endif
 
-if HAVE_MHD
-if HAVE_JSON
- REST_DIR = rest jsonapi rest-plugins
-endif
-endif
+REST_DIR = rest
 
 
-if TALER_ONLY
-SUBDIRS = \
- include \
- util
-else
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
+  nt \
   gnsrecord \
   hello \
   block \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(CURL_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -93,6 +67,7 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
@@ -112,7 +87,6 @@ SUBDIRS = \
   identity \
   namecache \
   namestore \
-  peerstore \
   cadet \
   set \
   consensus \
@@ -126,9 +100,6 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
-  integration-tests \
-
-endif
+  reclaim \
+  $(EXP_DIR) \
+  integration-tests