23 files changed, 0 insertions, 738 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
deleted file mode 100644
index 7df92d432d..0000000000
--- a/source4/lib/basic.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-[SUBSYSTEM::LZXPRESS]
-
-LZXPRESS_OBJ_FILES = $(libcompressionsrcdir)/lzxpress.o
-
-[SUBSYSTEM::GENCACHE]
-PRIVATE_DEPENDENCIES = TDB_WRAP
-
-GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o
-
-# PUBLIC_HEADERS += $(libgencachesrcdir)/gencache.h
-
-[SUBSYSTEM::LDB_WRAP]
-PUBLIC_DEPENDENCIES = LIBLDB
-PRIVATE_DEPENDENCIES = LDBSAMBA
-
-LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o
-PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h
-
-[SUBSYSTEM::TDB_WRAP]
-PUBLIC_DEPENDENCIES = LIBTDB
-
-TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
-PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
-
-SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)
-
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
deleted file mode 100644
index 4434ff3701..0000000000
--- a/source4/lib/cmdline/config.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
-
-LIBCMDLINE_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/credentials.o
-
-$(eval $(call proto_header_template,$(libcmdlinesrcdir)/credentials.h,$(LIBCMDLINE_CREDENTIALS_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::POPT_SAMBA]
-PUBLIC_DEPENDENCIES = LIBPOPT
-
-POPT_SAMBA_OBJ_FILES = $(libcmdlinesrcdir)/popt_common.o
-
-PUBLIC_HEADERS += $(libcmdlinesrcdir)/popt_common.h 
-
-[SUBSYSTEM::POPT_CREDENTIALS]
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-
-POPT_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/popt_credentials.o
-
-$(eval $(call proto_header_template,$(libcmdlinesrcdir)/popt_credentials.h,$(POPT_CREDENTIALS_OBJ_FILES:.o=.c)))
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
deleted file mode 100644
index 73836ef5f8..0000000000
--- a/source4/lib/com/config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-[SUBSYSTEM::COM]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR
-
-COM_OBJ_FILES = $(addprefix $(comsrcdir)/, tables.o rot.o main.o)
-
-[SUBSYSTEM::DCOM]
-PUBLIC_DEPENDENCIES = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
-					  RPC_NDR_OXIDRESOLVER
-
-DCOM_OBJ_FILES = $(addprefix $(comsrcdir)/dcom/, main.o tables.o)
-
-[MODULE::com_simple]
-SUBSYSTEM = COM
-INIT_FUNCTION = com_simple_init
-
-com_simple_OBJ_FILES = $(comsrcdir)/classes/simple.o
-
-[PYTHON::pycom]
-LIBRARY_REALNAME = samba/com.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = COM
-
-pycom_OBJ_FILES = $(comsrcdir)/pycom.o
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
deleted file mode 100644
index 5c7e1b7210..0000000000
--- a/source4/lib/events/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBEVENTS]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-CFLAGS = -Ilib/events
-
-LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, tevent_s4.o)
diff --git a/source4/lib/ldb-samba/config.mk b/source4/lib/ldb-samba/config.mk
deleted file mode 100644
index 392faade10..0000000000
--- a/source4/lib/ldb-samba/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################
-# Start SUBSYSTEM LDBSAMBA
-[SUBSYSTEM::LDBSAMBA]
-PUBLIC_DEPENDENCIES = LIBLDB
-PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_DRSBLOBS NDR_DNSP
-# End SUBSYSTEM LDBSAMBA
-################################################
-
-LDBSAMBA_OBJ_FILES = $(ldb_sambasrcdir)/ldif_handlers.o
-$(eval $(call proto_header_template,$(ldb_sambasrcdir)/ldif_handlers_proto.h,$(LDBSAMBA_OBJ_FILES:.o=.c)))
-
-
-[PYTHON::python_samba__ldb]
-LIBRARY_REALNAME = samba/_ldb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LDBSAMBA pyparam_util 
-
-python_samba__ldb_OBJ_FILES = $(ldb_sambasrcdir)/pyldb.o
diff --git a/source4/lib/ldb/external/libevents.m4 b/source4/lib/ldb/external/libevents.m4
deleted file mode 100644
index af046f1430..0000000000
--- a/source4/lib/ldb/external/libevents.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_SUBST(TEVENT_OBJ)
-AC_SUBST(TEVENT_CFLAGS)
-AC_SUBST(TEVENT_LIBS)
-
-AC_CHECK_HEADER(tevent.h,
-   [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"], , -ltalloc) ],
-   [PKG_CHECK_MODULES(TEVENT, tevent)])
diff --git a/source4/lib/ldb/external/libpopt.m4 b/source4/lib/ldb/external/libpopt.m4
deleted file mode 100644
index c5d12550ab..0000000000
--- a/source4/lib/ldb/external/libpopt.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-POPT_OBJ=""
-AC_SUBST(POPT_OBJ)
-AC_SUBST(POPT_LIBS)
-AC_SUBST(POPT_CFLAGS)
-
-AC_CHECK_HEADERS(popt.h)
-AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
diff --git a/source4/lib/ldb/external/libtalloc.m4 b/source4/lib/ldb/external/libtalloc.m4
deleted file mode 100644
index d41d3d1b34..0000000000
--- a/source4/lib/ldb/external/libtalloc.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_SUBST(TALLOC_OBJ)
-AC_SUBST(TALLOC_CFLAGS)
-AC_SUBST(TALLOC_LIBS)
-
-PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.2,
-	[ ],
-	[ AC_CHECK_HEADER(talloc.h, 
-		[ AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"])])])
diff --git a/source4/lib/ldb/external/libtdb.m4 b/source4/lib/ldb/external/libtdb.m4
deleted file mode 100644
index eb5a02030d..0000000000
--- a/source4/lib/ldb/external/libtdb.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_SUBST(TDB_OBJ)
-AC_SUBST(TDB_CFLAGS)
-AC_SUBST(TDB_LIBS)
-
-AC_CHECK_HEADER(tdb.h,
-   [AC_CHECK_LIB(tdb, tdb_open, [TDB_LIBS="-ltdb"]) ],
-   [PKG_CHECK_MODULES(TDB, tdb >= 1.2.0)])
diff --git a/source4/lib/ldb/external/pkg.m4 b/source4/lib/ldb/external/pkg.m4
deleted file mode 100644
index a8b3d06c81..0000000000
--- a/source4/lib/ldb/external/pkg.m4
+++ /dev/null
@@ -1,156 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk
deleted file mode 100644
index 6a1ef8164c..0000000000
--- a/source4/lib/ldb/ldb_ildap/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################
-# Start MODULE ldb_ildap
-[MODULE::ldb_ildap]
-SUBSYSTEM = LIBLDB
-CFLAGS = -I$(ldbsrcdir)/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
-INIT_FUNCTION = LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)
-ALIASES = ldapi ldaps ldap
-# End MODULE ldb_ildap
-################################################
-
-ldb_ildap_OBJ_FILES = $(ldbsrcdir)/ldb_ildap/ldb_ildap.o
-
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
deleted file mode 100644
index f0d0e85e6f..0000000000
--- a/source4/lib/ldb/tools/config.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBLDB_UTIL
-[SUBSYSTEM::LIBLDB_UTIL]
-CFLAGS = -I$(ldbsrcdir) -I$(ldbsrcdir)/include
-PUBLIC_DEPENDENCIES = LIBLDB
-# End SUBSYSTEM LIBLDB_UTIL
-################################################
-
-LIBLDB_UTIL_OBJ_FILES = $(ldbsrcdir)/tools/ldbutil.o
-
-################################################
-# Start SUBSYSTEM LIBLDB_CMDLINE
-[SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -I$(ldbsrcdir) -I$(ldbsrcdir)/include
-PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
-# End SUBSYSTEM LIBLDB_CMDLINE
-################################################
-
-LIBLDB_CMDLINE_OBJ_FILES = $(ldbsrcdir)/tools/cmdline.o
-
-################################################
-# Start BINARY ldbadd
-[BINARY::ldbadd]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE LIBCLI_RESOLVE
-# End BINARY ldbadd
-################################################
-
-
-ldbadd_OBJ_FILES = $(ldbsrcdir)/tools/ldbadd.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbadd.1
-
-################################################
-# Start BINARY ldbdel
-[BINARY::ldbdel]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE
-# End BINARY ldbdel
-################################################
-
-ldbdel_OBJ_FILES = $(ldbsrcdir)/tools/ldbdel.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbdel.1
-
-################################################
-# Start BINARY ldbmodify
-[BINARY::ldbmodify]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_UTIL \
-		LIBLDB_CMDLINE
-# End BINARY ldbmodify
-################################################
-
-ldbmodify_OBJ_FILES = $(ldbsrcdir)/tools/ldbmodify.o
-MANPAGES += $(ldbsrcdir)/man/ldbmodify.1
-
-################################################
-# Start BINARY ldbsearch
-[BINARY::ldbsearch]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE 
-# End BINARY ldbsearch
-################################################
-
-ldbsearch_OBJ_FILES = $(ldbsrcdir)/tools/ldbsearch.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbsearch.1
-
-################################################
-# Start BINARY ldbedit
-[BINARY::ldbedit]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-# End BINARY ldbedit
-################################################
-
-ldbedit_OBJ_FILES = $(ldbsrcdir)/tools/ldbedit.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbedit.1
-
-################################################
-# Start BINARY ldbrename
-[BINARY::ldbrename]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-# End BINARY ldbrename
-################################################
-
-ldbrename_OBJ_FILES = $(ldbsrcdir)/tools/ldbrename.o
-
-MANPAGES += $(ldbsrcdir)/man/ldbrename.1
-
-
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
deleted file mode 100644
index 1cdbbc6d76..0000000000
--- a/source4/lib/messaging/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-[SUBSYSTEM::MESSAGING]
-PUBLIC_DEPENDENCIES = \
-		LIBSAMBA-UTIL \
-		TDB_WRAP \
-		NDR_IRPC \
-		UNIX_PRIVS \
-		UTIL_TDB \
-		CLUSTER \
-		LIBNDR \
-		samba_socket
-
-MESSAGING_OBJ_FILES = $(libmessagingsrcdir)/messaging.o
-
-[PYTHON::python_messaging]
-LIBRARY_REALNAME = samba/messaging.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = MESSAGING LIBEVENTS python_irpc pyparam_util
-
-python_messaging_OBJ_FILES = $(libmessagingsrcdir)/pymessaging.o
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
deleted file mode 100644
index bc87644ef7..0000000000
--- a/source4/lib/policy/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-[SUBSYSTEM::policy]
-PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
-
-policy_OBJ_FILES = $(policydir)/gp_ldap.o $(policydir)/gp_filesys.c $(policydir)/gp_manage.c $(policydir)/gp_ini.c
-
-PC_FILES += $(policydir)/policy.pc
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
deleted file mode 100644
index 9ff917f75a..0000000000
--- a/source4/lib/registry/config.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-[SUBSYSTEM::TDR_REGF]
-PUBLIC_DEPENDENCIES = TDR 
-
-TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o
-
-# Special support for external builddirs
-$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.c: $(libregistrysrcdir)/regf.idl
-	@CPP="$(CPP)" $(PERL) $(pidldir)/pidl $(PIDL_ARGS) \
-		--header --outputdir=$(libregistrysrcdir) \
-		--tdr-parser -- $(libregistrysrcdir)/regf.idl
-
-clean::
-	@-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf*
-
-################################################
-# Start SUBSYSTEM registry
-[LIBRARY::registry]
-PUBLIC_DEPENDENCIES = \
-		LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
-		RPC_NDR_WINREG LDB_WRAP
-# End MODULE registry_ldb
-################################################
-
-PC_FILES += $(libregistrysrcdir)/registry.pc
-
-registry_VERSION = 0.0.1
-registry_SOVERSION = 0
-
-registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/, interface.o util.o samba.o \
-					patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
-					hive.o local.o ldb.o dir.o rpc.o) \
-					../libcli/registry/util_reg.o
-
-PUBLIC_HEADERS += $(libregistrysrcdir)/registry.h
-
-[SUBSYSTEM::registry_common]
-PUBLIC_DEPENDENCIES = registry
-
-registry_common_OBJ_FILES = $(libregistrysrcdir)/tools/common.o
-
-$(eval $(call proto_header_template,$(libregistrysrcdir)/tools/common.h,$(registry_common_OBJ_FILES:.o=.c)))
-
-################################################
-# Start BINARY regdiff
-[BINARY::regdiff]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
-# End BINARY regdiff
-################################################
-
-regdiff_OBJ_FILES = $(libregistrysrcdir)/tools/regdiff.o
-
-MANPAGES += $(libregistrysrcdir)/man/regdiff.1
-
-################################################
-# Start BINARY regpatch
-[BINARY::regpatch]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
-		registry_common
-# End BINARY regpatch
-################################################
-
-regpatch_OBJ_FILES = $(libregistrysrcdir)/tools/regpatch.o
-
-MANPAGES += $(libregistrysrcdir)/man/regpatch.1
-
-################################################
-# Start BINARY regshell
-[BINARY::regshell]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
-		SMBREADLINE registry_common
-# End BINARY regshell
-################################################
-
-regshell_OBJ_FILES = $(libregistrysrcdir)/tools/regshell.o
-
-MANPAGES += $(libregistrysrcdir)/man/regshell.1
-
-################################################
-# Start BINARY regtree
-[BINARY::regtree]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
-		registry_common
-# End BINARY regtree
-################################################
-
-regtree_OBJ_FILES = $(libregistrysrcdir)/tools/regtree.o
-
-MANPAGES += $(libregistrysrcdir)/man/regtree.1
-
-[SUBSYSTEM::torture_registry]
-PRIVATE_DEPENDENCIES = torture registry
-
-torture_registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/tests/, generic.o hive.o diff.o registry.o)
-
-$(eval $(call proto_header_template,$(libregistrysrcdir)/tests/proto.h,$(torture_registry_OBJ_FILES:.o=.c)))
-
-[PYTHON::py_registry]
-LIBRARY_REALNAME = samba/registry.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = registry PYTALLOC pycredentials pyparam_util
-
-py_registry_OBJ_FILES = $(libregistrysrcdir)/pyregistry.o
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
deleted file mode 100644
index 365347fe21..0000000000
--- a/source4/lib/samba3/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBSAMBA3
-[SUBSYSTEM::SMBPASSWD]
-PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL
-# End SUBSYSTEM LIBSAMBA3
-################################################
-
-SMBPASSWD_OBJ_FILES = $(libsrcdir)/samba3/smbpasswd.o
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
deleted file mode 100644
index fa987a1f46..0000000000
--- a/source4/lib/socket/config.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_CHECK_FUNCS(writev)
-AC_CHECK_FUNCS(readv)
-
-############################################
-# check for unix domain sockets
-# done by AC_LIBREPLACE_NETWORK_CHECKS
-SMB_ENABLE(socket_unix, NO)
-if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
-	SMB_ENABLE(socket_unix, YES)
-fi
-
-############################################
-# check for ipv6
-# done by AC_LIBREPLACE_NETWORK_CHECKS
-SMB_ENABLE(socket_ipv6, NO)
-if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-    SMB_ENABLE(socket_ipv6, YES)
-fi
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
deleted file mode 100644
index 07491e115a..0000000000
--- a/source4/lib/socket/config.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-##############################
-# Start SUBSYSTEM LIBNETIF
-[SUBSYSTEM::LIBNETIF]
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
-# End SUBSYSTEM LIBNETIF
-##############################
-
-LIBNETIF_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, interface.o netif.o)
-
-$(eval $(call proto_header_template,$(libsocketsrcdir)/netif_proto.h,$(LIBNETIF_OBJ_FILES:.o=.c)))
-
-################################################
-# Start MODULE socket_ip
-[MODULE::socket_ip]
-SUBSYSTEM = samba_socket
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
-# End MODULE socket_ip
-################################################
-
-socket_ip_OBJ_FILES = $(libsocketsrcdir)/socket_ip.o
-
-################################################
-# Start MODULE socket_unix
-[MODULE::socket_unix]
-SUBSYSTEM = samba_socket
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-# End MODULE socket_unix
-################################################
-
-socket_unix_OBJ_FILES = $(libsocketsrcdir)/socket_unix.o
-
-################################################
-# Start SUBSYSTEM SOCKET
-[SUBSYSTEM::samba_socket]
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBTSOCKET
-PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
-# End SUBSYSTEM SOCKET
-################################################
-
-samba_socket_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, socket.o access.o connect_multi.o connect.o)
-
diff --git a/source4/lib/stream/config.mk b/source4/lib/stream/config.mk
deleted file mode 100644
index 56d117e7bd..0000000000
--- a/source4/lib/stream/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::LIBPACKET]
-PRIVATE_DEPENDENCIES = LIBTLS
-
-LIBPACKET_OBJ_FILES = $(libstreamsrcdir)/packet.o
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
deleted file mode 100644
index 8a5b996638..0000000000
--- a/source4/lib/tls/config.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################
-# start SMB_EXT_LIB_GNUTLS
-# check for gnutls/gnutls.h and -lgnutls
-
-use_gnutls=auto
-AC_ARG_ENABLE(gnutls,
-AS_HELP_STRING([--enable-gnutls],[Turn on gnutls support (default=yes)]),
-    [if test x$enable_gnutls = xno; then
-        use_gnutls=no
-    fi])
-
-
-if test x$use_gnutls = xauto && pkg-config --exists gnutls; then
-	SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls >= 1.4.0, 
-							   [use_gnutls=yes], 
-							   [use_gnutls=no])
-fi
-	
-if test x$use_gnutls = xauto; then
-	AC_CHECK_HEADERS(gnutls/gnutls.h)
-	AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
-	AC_CHECK_DECL(gnutls_x509_crt_set_version,  
-				  [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
-	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-		SMB_ENABLE(GNUTLS,YES)
-		AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
-					  [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
-	fi
-	SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
-fi
-if test x$use_gnutls = xyes; then
-	#Some older versions have a different type name
-	AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
-	AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
-	AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
-	AC_CHECK_HEADERS(gcrypt.h)
-	AC_CHECK_LIB_EXT(gcrypt, GCRYPT_LIBS, gcry_control)
-	# On Solaris libgcrypt.so has a bug and seems to be not linked
-	# to libgpg-error.so, so we need to manually add them...
-	AC_CHECK_LIB_EXT(gpg-error, GCRYPT_LIBS, gpg_err_code_from_errno)
-	SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS)
-fi
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
deleted file mode 100644
index 0e1978cc1b..0000000000
--- a/source4/lib/tls/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBTLS]
-PUBLIC_DEPENDENCIES = \
-		LIBTALLOC GNUTLS GCRYPT LIBSAMBA-HOSTCONFIG samba_socket
-
-LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)
diff --git a/source4/lib/wmi/config.mk b/source4/lib/wmi/config.mk
deleted file mode 100644
index 3bb1690c7b..0000000000
--- a/source4/lib/wmi/config.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-[SUBSYSTEM::WMI]
-PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
-		NDR_DCOM \
-		RPC_NDR_REMACT \
-		NDR_TABLE \
-		DCOM_PROXY_DCOM \
-		DCOM
-
-WMI_OBJ_FILES = $(addprefix $(wmisrcdir)/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
-
-#################################
-# Start BINARY wmic
-[BINARY::wmic]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-                POPT_SAMBA \
-                POPT_CREDENTIALS \
-                LIBPOPT \
-				WMI
-
-wmic_OBJ_FILES = $(wmisrcdir)/tools/wmic.o
-# End BINARY wmic
-#################################
-
-#################################
-# Start BINARY wmis
-[BINARY::wmis]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-                POPT_SAMBA \
-                POPT_CREDENTIALS \
-                LIBPOPT \
-				WMI
-
-wmis_OBJ_FILES = \
-                $(wmisrcdir)/tools/wmis.o
-
-# End BINARY wmis
-#################################
-
-librpc/gen_ndr/dcom_p.c: idl
-
-#######################
-# Start LIBRARY swig_dcerpc
-[PYTHON::pywmi]
-PUBLIC_DEPENDENCIES = LIBCLI_SMB LIBNDR LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI
-
-$(eval $(call python_py_module_template,wmi.py,$(wmisrcdir)/wmi.py))
-
-pywmi_OBJ_FILES = $(wmisrcdir)/wmi_wrap.o
-$(pywmi_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
-
-# End LIBRARY swig_dcerpc
-#######################
-
-#################################
-# Start BINARY pdhc
-#[BINARY::pdhc]
-#INSTALLDIR = BINDIR
-#OBJ_FILES = \
-#                pdhc.o
-#PRIVATE_DEPENDENCIES = \
-#                POPT_SAMBA \
-#                POPT_CREDENTIALS \
-#                LIBPOPT \
-#		NDR_TABLE \
-#		RPC_NDR_WINREG
-# End BINARY pdhc
-#################################
diff --git a/source4/lib/zlib.mk b/source4/lib/zlib.mk
deleted file mode 100644
index 5c5e6e69ba..0000000000
--- a/source4/lib/zlib.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-[SUBSYSTEM::ZLIB]
-CFLAGS = -I$(zlibsrcdir)
-
-ZLIB_OBJ_FILES = \
-		$(zlibsrcdir)/adler32.o \
-		$(zlibsrcdir)/compress.o \
-		$(zlibsrcdir)/crc32.o \
-		$(zlibsrcdir)/gzio.o \
-		$(zlibsrcdir)/uncompr.o \
-		$(zlibsrcdir)/deflate.o \
-		$(zlibsrcdir)/trees.o \
-		$(zlibsrcdir)/zutil.o \
-		$(zlibsrcdir)/inflate.o \
-		$(zlibsrcdir)/infback.o \
-		$(zlibsrcdir)/inftrees.o \
-		$(zlibsrcdir)/inffast.o