From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 31 Oct 2010 02:17:29 +0100
Subject: s4: Remove the old perl/m4/make/mk-based build system.

The new waf-based build system now has all the same functionality, and
the old build system has been broken for quite some time.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
---
 source4/torture/config.mk              | 382 ---------------------------------
 source4/torture/drs/config.mk          |  25 ---
 source4/torture/libnetapi/config.m4    |  37 ----
 source4/torture/libnetapi/config.mk    |  18 --
 source4/torture/libsmbclient/config.m4 |  36 ----
 source4/torture/libsmbclient/config.mk |  15 --
 source4/torture/local/config.mk        |  66 ------
 source4/torture/smb2/config.mk         |  33 ---
 source4/torture/winbind/config.mk      |  16 --
 9 files changed, 628 deletions(-)
 delete mode 100644 source4/torture/config.mk
 delete mode 100644 source4/torture/drs/config.mk
 delete mode 100644 source4/torture/libnetapi/config.m4
 delete mode 100644 source4/torture/libnetapi/config.mk
 delete mode 100644 source4/torture/libsmbclient/config.m4
 delete mode 100644 source4/torture/libsmbclient/config.mk
 delete mode 100644 source4/torture/local/config.mk
 delete mode 100644 source4/torture/smb2/config.mk
 delete mode 100644 source4/torture/winbind/config.mk

(limited to 'source4/torture')

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
deleted file mode 100644
index 4e5c852df7..0000000000
--- a/source4/torture/config.mk
+++ /dev/null
@@ -1,382 +0,0 @@
-[SUBSYSTEM::TORTURE_UTIL]
-PRIVATE_DEPENDENCIES = LIBCLI_RAW
-PUBLIC_DEPENDENCIES = torture POPT_CREDENTIALS
-
-TORTURE_UTIL_OBJ_FILES = $(addprefix $(torturesrcdir)/, util_smb.o)
-
-#################################
-# Start SUBSYSTEM TORTURE_BASIC
-[MODULE::TORTURE_BASIC]
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_base_init
-OUTPUT_TYPE = MERGED_OBJ
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB POPT_CREDENTIALS \
-		TORTURE_UTIL LIBCLI_RAW \
-		TORTURE_RAW
-# End SUBSYSTEM TORTURE_BASIC
-#################################
-
-TORTURE_BASIC_OBJ_FILES = $(addprefix $(torturesrcdir)/basic/,  \
-		base.o \
-		misc.o \
-		scanner.o \
-		utable.o \
-		charset.o \
-		mangle_test.o \
-		denytest.o \
-		aliases.o \
-		locking.o \
-		secleak.o \
-		rename.o \
-		dir.o \
-		delete.o \
-		unlink.o \
-		disconnect.o \
-		delaywrite.o \
-		attr.o \
-		properties.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/basic/proto.h,$(TORTURE_BASIC_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_RAW
-[MODULE::TORTURE_RAW]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_raw_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
-		POPT_CREDENTIALS TORTURE_UTIL
-# End SUBSYSTEM TORTURE_RAW
-#################################
-
-TORTURE_RAW_OBJ_FILES = $(addprefix $(torturesrcdir)/raw/, \
-		qfsinfo.o \
-		qfileinfo.o \
-		setfileinfo.o \
-		search.o \
-		close.o \
-		open.o \
-		mkdir.o \
-		oplock.o \
-		notify.o \
-		mux.o \
-		ioctl.o \
-		chkpath.o \
-		unlink.o \
-		read.o \
-		context.o \
-		write.o \
-		lock.o \
-		pingpong.o \
-		lockbench.o \
-		lookuprate.o \
-		tconrate.o \
-		openbench.o \
-		rename.o \
-		eas.o \
-		streams.o \
-		acls.o \
-		seek.o \
-		samba3hide.o \
-		samba3misc.o \
-		composite.o \
-		raw.o \
-		offline.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/raw/proto.h,$(TORTURE_RAW_OBJ_FILES:.o=.c)))
-
-mkinclude smb2/config.mk
-mkinclude winbind/config.mk
-mkinclude libnetapi/config.mk
-mkinclude libsmbclient/config.mk
-
-[SUBSYSTEM::TORTURE_NDR]
-PRIVATE_DEPENDENCIES = torture SERVICE_SMB
-
-TORTURE_NDR_OBJ_FILES = $(addprefix $(torturesrcdir)/ndr/, ndr.o winreg.o atsvc.o lsa.o epmap.o dfs.o netlogon.o drsuapi.o spoolss.o samr.o dfsblob.o drsblobs.o nbt.o ntlmssp.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ndr/proto.h,$(TORTURE_NDR_OBJ_FILES:.o=.c)))
-
-[SUBSYSTEM::TORTURE_DFS]
-PRIVATE_DEPENDENCIES = torture LIBCLI_SMB NDR_DFSBLOBS TORTURE_UTIL
-
-TORTURE_DFS_OBJ_FILES = $(addprefix $(torturesrcdir)/dfs/, common.o domaindfs.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/dfs/proto.h,$(TORTURE_DFS_OBJ_FILES:.o=.c)))
-
-[MODULE::torture_rpc]
-OUTPUT_TYPE = MERGED_OBJ
-# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-#OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_rpc_init
-PRIVATE_DEPENDENCIES = \
-		NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
-		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
-		RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
-		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \
-		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \
-		LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP TORTURE_DFS \
-		dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE
-
-torture_rpc_OBJ_FILES = $(addprefix $(torturesrcdir)/rpc/, \
-		join.o lsa.o forest_trust.o lsa_lookup.o session_key.o echo.o dfs.o drsuapi.o \
-		drsuapi_cracknames.o dssync.o dsgetinfo.o spoolss.o spoolss_notify.o spoolss_win.o spoolss_access.o \
-		unixinfo.o samr.o samr_accessmask.o wkssvc.o srvsvc.o svcctl.o atsvc.o \
-		eventlog.o epmapper.o winreg.o initshutdown.o oxidresolve.o remact.o mgmt.o \
-		scanner.o autoidl.o countcalls.o testjoin.o schannel.o netlogon.o remote_pac.o samlogon.o \
-		samsync.o multi_bind.o dssetup.o alter_context.o bench.o samba3rpc.o rpc.o async_bind.o \
-		handles.o frsapi.o object_uuid.o ntsvcs.o browser.o bind.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/rpc/proto.h,$(torture_rpc_OBJ_FILES:.o=.c)))
-
-#################################
-# RPC/Local DRSUAPI tests
-mkinclude drs/config.mk
-
-#################################
-# Start SUBSYSTEM TORTURE_RAP
-[MODULE::TORTURE_RAP]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_rap_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB NDR_RAP
-# End SUBSYSTEM TORTURE_RAP
-#################################
-
-TORTURE_RAP_OBJ_FILES = $(torturesrcdir)/rap/rap.o $(torturesrcdir)/rap/rpc.o $(torturesrcdir)/rap/printing.o $(torturesrcdir)/rap/sam.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/rap/proto.h,$(TORTURE_RAP_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_AUTH
-[MODULE::TORTURE_AUTH]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB gensec auth KERBEROS \
-		POPT_CREDENTIALS SMBPASSWD torture
-# End SUBSYSTEM TORTURE_AUTH
-#################################
-
-TORTURE_AUTH_OBJ_FILES = $(addprefix $(torturesrcdir)/auth/, ntlmssp.o pac.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/auth/proto.h,$(TORTURE_AUTH_OBJ_FILES:.o=.c)))
-
-mkinclude local/config.mk
-
-#################################
-# Start MODULE TORTURE_NBENCH
-[MODULE::TORTURE_NBENCH]
-OUTPUT_TYPE = MERGED_OBJ
-SUBSYSTEM = smbtorture
-INIT_FUNCTION = torture_nbench_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL 
-# End MODULE TORTURE_NBENCH
-#################################
-
-TORTURE_NBENCH_OBJ_FILES = $(addprefix $(torturesrcdir)/nbench/, nbio.o nbench.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/nbench/proto.h,$(TORTURE_NBENCH_OBJ_FILES:.o=.c)))
-
-#################################
-# Start MODULE TORTURE_UNIX
-[MODULE::TORTURE_UNIX]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_unix_init
-PRIVATE_DEPENDENCIES = TORTURE_UTIL 
-# End MODULE TORTURE_UNIX
-#################################
-
-TORTURE_UNIX_OBJ_FILES = $(addprefix $(torturesrcdir)/unix/, unix.o whoami.o unix_info2.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/unix/proto.h,$(TORTURE_UNIX_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_LDAP
-[MODULE::TORTURE_LDAP]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_ldap_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP
-# End SUBSYSTEM TORTURE_LDAP
-#################################
-
-TORTURE_LDAP_OBJ_FILES = $(addprefix $(torturesrcdir)/ldap/, common.o basic.o schema.o uptodatevector.o \
-	cldap.o cldapbench.o ldap_sort.o nested_search.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ldap/proto.h,$(TORTURE_LDAP_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NBT
-[MODULE::TORTURE_NBT]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_nbt_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc
-# End SUBSYSTEM TORTURE_NBT
-#################################
-
-TORTURE_NBT_OBJ_FILES = $(addprefix $(torturesrcdir)/nbt/, query.o register.o \
-	wins.o winsbench.o winsreplication.o dgram.o nbt.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/nbt/proto.h,$(TORTURE_NBT_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NET
-[MODULE::TORTURE_NET]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_net_init
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-NET \
-		POPT_CREDENTIALS \
-		torture_rpc \
-		PROVISION
-# End SUBSYSTEM TORTURE_NET
-#################################
-
-TORTURE_NET_OBJ_FILES = $(addprefix $(torturesrcdir)/libnet/, libnet.o \
-					   utils.o userinfo.o userman.o groupinfo.o groupman.o \
-					   domain.o libnet_lookup.o libnet_user.o libnet_group.o \
-					   libnet_share.o libnet_rpc.o libnet_domain.o libnet_BecomeDC.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libnet/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
-
-#################################
-# Start SUBSYSTEM TORTURE_NTP
-[MODULE::TORTURE_NTP]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_ntp_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		torture_rpc 
-# End SUBSYSTEM TORTURE_NTP
-#################################
-
-TORTURE_NTP_OBJ_FILES = $(addprefix $(torturesrcdir)/ntp/, ntp_signd.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/ntp/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
-
-#################################
-# Start BINARY smbtorture
-[BINARY::smbtorture]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		torture \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		dcerpc \
-		LIBCLI_SMB \
-		SMBREADLINE
-# End BINARY smbtorture
-#################################
-
-smbtorture_OBJ_FILES = \
-		$(torturesrcdir)/smbtorture.o \
-		$(torturesrcdir)/torture.o  \
-		$(torturesrcdir)/shell.o
-
-PUBLIC_HEADERS += $(torturesrcdir)/smbtorture.h
-MANPAGES += $(torturesrcdir)/man/smbtorture.1
-
-#################################
-# Start BINARY gentest
-[BINARY::gentest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBCLI_SMB \
-		LIBCLI_RAW
-# End BINARY gentest
-#################################
-
-gentest_OBJ_FILES = $(torturesrcdir)/gentest.o
-
-MANPAGES += $(torturesrcdir)/man/gentest.1
-
-#################################
-# Start BINARY masktest
-[BINARY::masktest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBCLI_SMB
-# End BINARY masktest
-#################################
-
-masktest_OBJ_FILES = $(torturesrcdir)/masktest.o
-
-MANPAGES += $(torturesrcdir)/man/masktest.1
-
-#################################
-# Start BINARY locktest
-[BINARY::locktest]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBPOPT \
-		POPT_SAMBA \
-		POPT_CREDENTIALS \
-		LIBSAMBA-UTIL \
-		LIBCLI_SMB \
-		LIBSAMBA-HOSTCONFIG
-# End BINARY locktest
-#################################
-
-locktest_OBJ_FILES = $(torturesrcdir)/locktest.o
-
-MANPAGES += $(torturesrcdir)/man/locktest.1
-
-GCOV=0
-
-ifeq ($(MAKECMDGOALS),gcov)
-GCOV=1
-endif
-
-ifeq ($(MAKECMDGOALS),lcov)
-GCOV=1
-endif
-
-ifeq ($(MAKECMDGOALS),testcov-html)
-GCOV=1
-endif
-
-ifeq ($(GCOV),1)
-CFLAGS += --coverage
-LDFLAGS += --coverage
-endif
-
-COV_TARGET = test
-
-gcov: test
-	for I in $(sort $(dir $(ALL_OBJS))); \
-		do $(GCOV) -p -o $$I $$I/*.c; \
-	done
-
-samba4.info: test
-	-rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
-	cd .. && lcov --base-directory `pwd`/source4 --directory source4 --directory nsswitch --directory libcli --directory librpc --directory lib --capture --output-file source4/samba4.info
-
-lcov: samba4.info
-	genhtml -o coverage $<
-
-testcov-html:: lcov
-
-clean::
-	@rm -f samba.info
diff --git a/source4/torture/drs/config.mk b/source4/torture/drs/config.mk
deleted file mode 100644
index 0fdeb97df1..0000000000
--- a/source4/torture/drs/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_DRS
-[MODULE::TORTURE_DRS]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_drs_init
-PRIVATE_DEPENDENCIES = \
-		NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
-		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
-		RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
-		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \
-		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \
-		LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP \
-		dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE
-# End SUBSYSTEM TORTURE_DRS
-#################################
-
-TORTURE_DRS_OBJ_FILES = \
-		$(torturesrcdir)/drs/drs_init.o \
-		$(torturesrcdir)/drs/drs_util.o \
-		$(torturesrcdir)/drs/unit/schemainfo_tests.o \
-		$(torturesrcdir)/drs/unit/prefixmap_tests.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/drs/proto.h,$(TORTURE_DRS_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/libnetapi/config.m4 b/source4/torture/libnetapi/config.m4
deleted file mode 100644
index 402f1123a5..0000000000
--- a/source4/torture/libnetapi/config.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# start SMB_EXT_LIB_NETAPI
-# check for netapi.h and -lnetapi
-
-use_netapi=auto
-AC_ARG_ENABLE(netapi,
-AS_HELP_STRING([--enable-netapi],[Turn on netapi support (default=auto)]),
-    [if test x$enable_netapi = xno; then
-        use_netapi=no
-    fi])
-
-
-#if test x$use_netapi = xauto && pkg-config --exists netapi; then
-#	SMB_EXT_LIB_FROM_PKGCONFIG(NETAPI, netapi < 0.1,
-#							   [use_netapi=yes],
-#							   [use_netapi=no])
-#fi
-
-SMB_ENABLE(TORTURE_LIBNETAPI,NO)
-if test x$use_netapi != xno; then
-	AC_CHECK_HEADERS(netapi.h)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, libnetapi_init)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserModalsGet)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetGroups)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetInfo)
-	AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserSetInfo)
-	if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then
-		AC_DEFINE(ENABLE_LIBNETAPI,1,[Whether we have libnetapi on the host system])
-		SMB_ENABLE(NETAPI,YES)
-		SMB_ENABLE(TORTURE_LIBNETAPI,YES)
-	else
-		if test x$use_netapi != xauto; then
-			AC_MSG_ERROR([--enable-netapi: libnetapi not found])
-		fi
-	fi
-	SMB_EXT_LIB(NETAPI, $NETAPI_LIBS)
-fi
diff --git a/source4/torture/libnetapi/config.mk b/source4/torture/libnetapi/config.mk
deleted file mode 100644
index 0cd485e44a..0000000000
--- a/source4/torture/libnetapi/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LIBNETAPI
-[MODULE::TORTURE_LIBNETAPI]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_libnetapi_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		NETAPI
-# End SUBSYSTEM TORTURE_LIBNETAPI
-#################################
-
-TORTURE_LIBNETAPI_OBJ_FILES = $(addprefix $(torturesrcdir)/libnetapi/, libnetapi.o \
-					libnetapi_user.o \
-					libnetapi_group.o
-					libnetapi_server.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libnetapi/proto.h,$(TORTURE_LIBNETAPI_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/libsmbclient/config.m4 b/source4/torture/libsmbclient/config.m4
deleted file mode 100644
index 481e2fa968..0000000000
--- a/source4/torture/libsmbclient/config.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################
-# start SMB_EXT_LIB_LIBSMBCLIENT
-# check for libsmbclient.h and -lsmbclient
-
-use_libsmbclient=auto
-AC_ARG_ENABLE(libsmbclient,
-AS_HELP_STRING([--enable-libsmbclient],[Turn on libsmbclient support (default=auto)]),
-    [if test x$enable_libsmbclient = xno; then
-        use_libsmbclient=no
-    fi])
-
-
-#if test x$use_libsmbclient = xauto && pkg-config --exists libsmbclient; then
-#	SMB_EXT_LIB_FROM_PKGCONFIG(LIBSMBCLIENT, libsmbclient < 0.1,
-#							   [use_libsmbclient=yes],
-#							   [use_libsmbclient=no])
-#fi
-
-SMB_ENABLE(TORTURE_LIBSMBCLIENT,NO)
-if test x$use_libsmbclient != xno; then
-	AC_CHECK_HEADERS(libsmbclient.h)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_new_context)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_getOptionNoAutoAnonymousLogin)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_setOptionCaseSensitive)
-	AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_setOptionUseCCache)
-	if test x"$ac_cv_header_libsmbclient_h" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_new_context" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_getOptionNoAutoAnonymousLogin" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_setOptionCaseSensitive" = x"yes" -a x"$ac_cv_lib_ext_smbclient_smbc_setOptionUseCCache" = x"yes"; then
-		AC_DEFINE(ENABLE_LIBSMBCLIENT,1,[Whether we have libsmbclient on the host system])
-		SMB_ENABLE(SMBCLIENT,YES)
-		SMB_ENABLE(TORTURE_LIBSMBCLIENT,YES)
-	else
-		if test x$use_libsmbclient != xauto; then
-			AC_MSG_ERROR([--enable-libsmbclient: libsmbclient not found])
-		fi
-	fi
-	SMB_EXT_LIB(SMBCLIENT, $SMBCLIENT_LIBS)
-fi
diff --git a/source4/torture/libsmbclient/config.mk b/source4/torture/libsmbclient/config.mk
deleted file mode 100644
index a1c62fbf81..0000000000
--- a/source4/torture/libsmbclient/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LIBSMBCLIENT
-[MODULE::TORTURE_LIBSMBCLIENT]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_libsmbclient_init
-PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS \
-		SMBCLIENT
-# End SUBSYSTEM TORTURE_LIBSMBCLIENT
-#################################
-
-TORTURE_LIBSMBCLIENT_OBJ_FILES = $(addprefix $(torturesrcdir)/libsmbclient/, libsmbclient.o)
-
-$(eval $(call proto_header_template,$(torturesrcdir)/libsmbclient/proto.h,$(TORTURE_LIBSMBCLIENT_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
deleted file mode 100644
index d56306b794..0000000000
--- a/source4/torture/local/config.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#################################
-# Start SUBSYSTEM TORTURE_LOCAL
-[MODULE::TORTURE_LOCAL]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_local_init
-PRIVATE_DEPENDENCIES = \
-		RPC_NDR_ECHO \
-		TDR \
-		LIBCLI_SMB \
-		MESSAGING \
-		ICONV \
-		POPT_CREDENTIALS \
-		TORTURE_AUTH \
-		TORTURE_UTIL \
-		TORTURE_NDR \
-		TORTURE_LIBCRYPTO \
-		share \
-		torture_registry \
-		PROVISION \
-		NSS_WRAPPER \
-		LDB \
-		SAMDB
-# End SUBSYSTEM TORTURE_LOCAL
-#################################
-
-TORTURE_LOCAL_OBJ_FILES = \
-		$(torturesrcdir)/../../lib/util/charset/tests/iconv.o \
-		$(torturesrcdir)/../../lib/talloc/testsuite.o \
-		$(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
-		$(torturesrcdir)/../../lib/replace/test/os2_delete.o \
-		$(torturesrcdir)/../../lib/replace/test/strptime.o \
-		$(torturesrcdir)/../../lib/replace/test/testsuite.o \
-		$(torturesrcdir)/../lib/messaging/tests/messaging.o \
-		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
-		$(torturesrcdir)/../librpc/tests/binding_string.o \
-		$(torturesrcdir)/../../lib/util/tests/idtree.o \
-		$(torturesrcdir)/../../lib/util/tests/dlinklist.o \
-		$(torturesrcdir)/../lib/socket/testsuite.o \
-		$(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
-		$(torturesrcdir)/../../lib/nss_wrapper/testsuite.o \
-		$(torturesrcdir)/../libcli/resolve/testsuite.o \
-		$(torturesrcdir)/../../lib/util/tests/strlist.o \
-		$(torturesrcdir)/../../lib/util/tests/parmlist.o \
-		$(torturesrcdir)/../../lib/util/tests/str.o \
-		$(torturesrcdir)/../../lib/util/tests/time.o \
-		$(torturesrcdir)/../../lib/util/tests/asn1_tests.o \
-		$(torturesrcdir)/../../lib/util/tests/data_blob.o \
-		$(torturesrcdir)/../../lib/util/tests/file.o \
-		$(torturesrcdir)/../../lib/util/tests/genrand.o \
-		$(torturesrcdir)/../../lib/compression/testsuite.o \
-		$(torturesrcdir)/../../lib/util/charset/tests/charset.o \
-		$(torturesrcdir)/../libcli/security/tests/sddl.o \
-		$(libtdrsrcdir)/testsuite.o \
-		$(torturesrcdir)/../../lib/tevent/testsuite.o \
-		$(torturesrcdir)/../param/tests/share.o \
-		$(torturesrcdir)/../param/tests/loadparm.o \
-		$(torturesrcdir)/../auth/credentials/tests/simple.o \
-		$(torturesrcdir)/local/local.o \
-		$(torturesrcdir)/local/dbspeed.o \
-		$(torturesrcdir)/local/torture.o \
-		$(torturesrcdir)/ldb/ldb.o \
-		$(torturesrcdir)/../dsdb/common/tests/dsdb_dn.o \
-		$(torturesrcdir)/../dsdb/schema/tests/schema_syntax.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/local/proto.h,$(TORTURE_LOCAL_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
deleted file mode 100644
index 8ff38bbf40..0000000000
--- a/source4/torture/smb2/config.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#################################
-# Start SUBSYSTEM TORTURE_SMB2
-[MODULE::TORTURE_SMB2]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_smb2_init
-PRIVATE_DEPENDENCIES = \
-		LIBCLI_SMB2 POPT_CREDENTIALS torture
-# End SUBSYSTEM TORTURE_SMB2
-#################################
-
-TORTURE_SMB2_OBJ_FILES = $(addprefix $(torturesrcdir)/smb2/, \
-		connect.o \
-		scan.o \
-		util.o \
-		getinfo.o \
-		setinfo.o \
-		lock.o \
-		notify.o \
-		smb2.o \
-		durable_open.o \
-		oplock.o \
-		dir.o \
-		lease.o \
-		create.o \
-		acls.o \
-		read.o \
-		compound.o \
-		streams.o)
-
-
-$(eval $(call proto_header_template,$(torturesrcdir)/smb2/proto.h,$(TORTURE_SMB2_OBJ_FILES:.o=.c)))
diff --git a/source4/torture/winbind/config.mk b/source4/torture/winbind/config.mk
deleted file mode 100644
index 2bd613d649..0000000000
--- a/source4/torture/winbind/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#################################
-# Start SUBSYSTEM TORTURE_WINBIND
-[MODULE::TORTURE_WINBIND]
-SUBSYSTEM = smbtorture
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = torture_winbind_init
-PRIVATE_DEPENDENCIES = \
-		LIBWBCLIENT LIBWINBIND-CLIENT torture PAM_ERRORS
-# End SUBSYSTEM TORTURE_WINBIND
-#################################
-
-TORTURE_WINBIND_OBJ_FILES = $(addprefix $(torturesrcdir)/winbind/, winbind.o struct_based.o) ../nsswitch/libwbclient/tests/wbclient.o
-
-$(eval $(call proto_header_template,$(torturesrcdir)/winbind/proto.h,$(TORTURE_WINBIND_OBJ_FILES:.o=.c)))
-
-- 
cgit