1 files changed, 5 insertions, 99 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5fd00e3f5..524b989c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,105 +1,11 @@
 # This Makefile.am is in the public domain
 
-if HAVE_TESTING
- TESTING = testing
- TESTBED = testbed-logger testbed
- ATS_TESTS = ats-tests
-endif
-
-if HAVE_EXPERIMENTAL
- EXP_DIR = \
-  rps \
-  messenger
-  #abd FTBFS
-if HAVE_ABE
- EXP_DIR += \
-  abe
-endif
- EXP_DIR += \
-  auction
-endif
-
-JSON_DIR = json
-CURL_DIR = curl
-
-if BUILD_PULSE_HELPERS
-CONVERSATION_DIR = conversation
-else
-if BUILD_GST_HELPERS
-CONVERSATION_DIR = conversation
-endif
-endif
-
-if HAVE_SQLITE
- SQLITE_DIR = sq
-endif
-
-if HAVE_MYSQL
- MYSQL_DIR = mysql my
-endif
-
-if HAVE_POSTGRESQL
- POSTGRES_DIR = pq
-endif
-
-REST_DIR = rest
 
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
-  util \
-  nt \
-  hello \
-  block \
-  statistics \
-  arm \
-  $(TESTING) \
-  $(JSON_DIR) \
-  $(CURL_DIR) \
-  $(REST_DIR) \
-  peerinfo \
-  $(SQLITE_DIR) \
-  $(MYSQL_DIR) \
-  $(POSTGRES_DIR) \
-  datacache \
-  datastore \
-  template \
-  peerstore \
-  ats \
-  nat \
-  nat-auto \
-  fragmentation \
-  transport \
-  ats-tool \
-  core \
-  $(TESTBED) \
-  $(ATS_TESTS) \
-  nse \
-  dht \
-  hostlist \
-  topology \
-  regex \
-  dns \
-  identity \
-  gnsrecord \
-  namecache \
-  namestore \
-  peerinfo-tool \
-  cadet \
-  set \
-  seti \
-  setu \
-  consensus \
-  scalarproduct \
-  revocation \
-  vpn \
-  gns \
-  zonemaster \
-  $(CONVERSATION_DIR) \
-  fs \
-  exit \
-  pt \
-  secretsharing \
-  reclaim \
-  $(EXP_DIR) \
-  integration-tests
+  lib \
+        plugin \
+        service \
+        cli \
+        contrib