Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ffb39260cf068e807bb4a0c1c8c0bf0dbca7e3a0..c1c708aa6ecb02e4375cf37d45b84af0a7ef6420 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,13 +11,7 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  rps \
-  multicast \
-  psycutil \
-  psycstore \
-  psyc \
-  social
-#  dv (FTBFS)
+  rps
 if HAVE_ABE
 if HAVE_JSON
  EXP_DIR += \
@@ -66,7 +60,7 @@ endif
 
 if HAVE_MHD
 if HAVE_JSON
- REST_DIR = rest rest-plugins
+ REST_DIR = rest
 endif
 endif
 
@@ -87,6 +81,8 @@ SUBDIRS = \
   statistics \
   arm \
   $(TESTING) \
+  $(JSON_DIR) \
+  $(REST_DIR) \
   peerinfo \
   $(SQLITE_DIR) \
   $(MYSQL_DIR) \
@@ -94,11 +90,11 @@ SUBDIRS = \
   datacache \
   datastore \
   template \
+  peerstore \
   ats \
   nat \
   nat-auto \
   fragmentation \
-  peerstore \
   transport \
   ats-tool \
   peerinfo-tool \
@@ -127,9 +123,7 @@ SUBDIRS = \
   exit \
   pt \
   secretsharing \
-       $(EXP_DIR) \
-  $(JSON_DIR) \
-  $(REST_DIR) \
+  $(EXP_DIR) \
   integration-tests
 
 endif