adding a GNUNET_memcmp_priv for constant-time comparing of data; fixes #6152 (modulo...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 5fd65141bc63ca10cb50188c59b89b9c4406c0a1..e1d73ab01999b56707e3872f53e32a5dcd209807 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,35 +12,27 @@ 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
-endif
+  abe
 endif
 if HAVE_JSON
  EXP_DIR += \
-    auction
+  auction
 endif
 endif
 
 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
-endif
+  CURL_DIR = curl
 endif
 endif
 
@@ -66,17 +58,13 @@ endif
 
 if HAVE_MHD
 if HAVE_JSON
- REST_DIR = rest rest-plugins
+ REST_DIR = rest
+ RECLAIM_DIR = \
+  reclaim
 endif
 endif
 
 
-if TALER_ONLY
-SUBDIRS = \
- include \
- util
-else
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -87,6 +75,9 @@ SUBDIRS = \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(CURL_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -127,9 +118,6 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
+  $(RECLAIM_DIR) \
+  $(EXP_DIR) \
   integration-tests
-
-endif