2 files changed, 2 insertions, 22 deletions
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index a4e7a0dba9..5701b1b5c3 100644
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -2,28 +2,6 @@ if test x"$with_ldap_support" = x"yes"; then
     SMB_MODULE_DEFAULT(libldb_ldap,STATIC)
 fi
 
-SMB_SUBSYSTEM_MK(LIBLDB,lib/ldb/config.mk)
-
-SMB_MODULE_MK(libldb_ldap,LIBLDB,NOT,lib/ldb/config.mk)
-
-SMB_MODULE_MK(libldb_tdb,LIBLDB,STATIC,lib/ldb/config.mk)
-
 if test x"$experimental" = x"yes"; then
 	SMB_LIBRARY_ENABLE(libldb,YES)
 fi
-
-SMB_LIBRARY_MK(libldb,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbadd,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbdel,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbmodify,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbsearch,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbedit,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbrename,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbtest,lib/ldb/config.mk)
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 10b8c76f97..81c6382292 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -1,6 +1,7 @@
 ################################################
 # Start MODULE libldb_ldap
 [MODULE::libldb_ldap]
+SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
 		lib/ldb/ldb_ldap/ldb_ldap.o
 REQUIRED_SUBSYSTEMS = \
@@ -11,6 +12,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start MODULE libldb_tdb
 [MODULE::libldb_tdb]
+SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
 		lib/ldb/ldb_tdb/ldb_tdb.o
 ADD_OBJ_FILES = \