r14572: Give libraries saner names, remove some .pc files, make some things

subsystems in case a library doesn't make sense.
(This used to be commit ed382873fd01457a53e0a1e1f5ba6753dfbc0646)

21 files changed, 76 insertions, 187 deletions

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index a86e43c3c0..03edc8a68b 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -37,7 +37,7 @@ SUBSYSTEM = auth
 OBJ_FILES = \
 		auth_winbind.o
 REQUIRED_SUBSYSTEMS = \
-		LIBWINBIND_CLIENT \
+		LIBWINBIND-CLIENT \
 		NDR_NETLOGON LIBNDR
 # End MODULE auth_winbind
 #######################
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 0e53f79c2d..b01d1283ae 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -8,7 +8,7 @@ PUBLIC_HEADERS = gensec.h spnego.h
 PUBLIC_PROTO_HEADER = gensec_proto.h
 OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
-		CREDENTIALS LIBBASIC
+		CREDENTIALS LIBSAMBA-UTIL
 # End SUBSYSTEM gensec
 #################################
 
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index abf88662b6..41e90c33b7 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -139,7 +139,7 @@ sub run_config_mk($$$)
 			$prev = "";
 		}
 
-		if ($line =~ /^\[([a-zA-Z0-9_:]+)\][\t ]*$/) 
+		if ($line =~ /^\[([-a-zA-Z0-9_:]+)\][\t ]*$/) 
 		{
 			$section = $1;
 			$infragment = 0;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b0c7ea3be1..03c172c38d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -202,7 +202,7 @@ sub SharedLibrary($$)
 
 	if ($ctx->{TYPE} eq "LIBRARY") {
 		push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
-		push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
+		push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
 	} elsif ($ctx->{TYPE} eq "MODULE") {
 		push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
 		push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
diff --git a/source4/client/config.mk b/source4/client/config.mk
index 10f56da138..d05b890ff6 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -7,9 +7,9 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		client.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
+		LIBSAMBA-CONFIG \
 		LIBREADLINE \
-		LIBBASIC \
+		LIBSAMBA-UTIL \
 		LIBSMB \
 		RPC_NDR_SRVSVC \
 		LIBCLI_LSA \
@@ -27,7 +27,7 @@ OBJ_FILES = \
 		cifsdd.o \
 		cifsddio.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
+		LIBSAMBA-CONFIG \
 		LIBSMB \
 		LIBPOPT \
 		POPT_SAMBA \
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index b1588ba6d0..b2d2ac2ac4 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -1,6 +1,6 @@
 # LIB GTK SMB subsystem
 
-[LIBRARY::GTK_SAMBA]
+[LIBRARY::gtksamba]
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Common Samba-related widgets for GTK+ applications
@@ -9,28 +9,28 @@ OBJ_FILES = common/gtk-smb.o \
 		common/select.o \
 		common/gtk_events.o \
 		common/credentials.o
-REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
+REQUIRED_SUBSYSTEMS = CHARSET LIBSAMBA-UTIL EXT_LIB_gtk RPC_NDR_SAMR
 
 [BINARY::gregedit]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gregedit.o
-REQUIRED_SUBSYSTEMS = CONFIG registry GTK_SAMBA
+REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG registry gtksamba
 MANPAGE = man/gregedit.1
 
 [BINARY::gepdump]
 INSTALLDIR = BINDIR
 MANPAGE = man/gepdump.1
 OBJ_FILES = tools/gepdump.o
-REQUIRED_SUBSYSTEMS = CONFIG GTK_SAMBA RPC_NDR_EPMAPPER RPC_NDR_MGMT
+REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG gtksamba RPC_NDR_EPMAPPER RPC_NDR_MGMT
 
 [BINARY::gwcrontab]
 INSTALLDIR = BINDIR
 MANPAGE = man/gwcrontab.1
 OBJ_FILES = tools/gwcrontab.o
-REQUIRED_SUBSYSTEMS = CONFIG GTK_SAMBA RPC_NDR_ATSVC
+REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG gtksamba RPC_NDR_ATSVC
 
 # This binary is disabled for now as it doesn't do anything useful yet...
 [BINARY::gwsam]
 #INSTALLDIR = BINDIR
 OBJ_FILES = tools/gwsam.o tools/gwsam_user.o
-REQUIRED_SUBSYSTEMS = CONFIG RPC_NDR_SAMR GTK_SAMBA
+REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG RPC_NDR_SAMR gtksamba
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index f0c13886d0..de6d598159 100644
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -1,11 +1,15 @@
-[SUBSYSTEM::com]
+[LIBRARY::com]
+VERSION = 0.0.1
+SO_VERSION = 0
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		tables.o \
 		rot.o \
 		main.o
 
-[SUBSYSTEM::dcom]
+[LIBRARY::dcom]
+VERSION = 0.0.1
+SO_VERSION = 0
 PRIVATE_PROTO_HEADER = dcom/proto.h
 OBJ_FILES = \
 		dcom/main.o \
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 19ea9f6580..661c31d027 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -170,7 +170,7 @@ OBJ_FILES = \
 [SUBSYSTEM::LIBLDB_CMDLINE]
 OBJ_FILES= \
 		tools/cmdline.o
-REQUIRED_SUBSYSTEMS = ldb LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
 
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 13700939cb..fe80c62af4 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -92,7 +92,7 @@ OBJ_FILES = \
 		reg_samba.o \
 		patchfile.o
 REQUIRED_SUBSYSTEMS = \
-		LIBBASIC
+		LIBSAMBA-UTIL
 PRIVATE_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
@@ -105,7 +105,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
 		tools/regdiff.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
@@ -117,7 +117,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
 		tools/regpatch.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
@@ -129,7 +129,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
 		tools/regshell.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
+		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
 MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
@@ -141,7 +141,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES= \
 		tools/regtree.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
+		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index a55315c522..115f8f8726 100644
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -4,5 +4,5 @@ VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Simple marshall/unmarshall library
 PUBLIC_PROTO_HEADER = tdr_proto.h
-REQUIRED_SUBSYSTEMS = LIBTALLOC LIBBASIC
+REQUIRED_SUBSYSTEMS = LIBTALLOC LIBSAMBA-UTIL
 OBJ_FILES = tdr.o
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index a0eabaaf31..5aac291152 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,4 +1,4 @@
-[LIBRARY::LIBBASIC]
+[LIBRARY::LIBSAMBA-UTIL]
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Generic utility functions
@@ -33,7 +33,7 @@ OBJ_FILES = xfile.o \
 		module.o
 REQUIRED_SUBSYSTEMS = \
 		CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-		SOCKET_WRAPPER CONFIG \
+		SOCKET_WRAPPER LIBSAMBA-CONFIG \
 # for the base64 functions
 		ldb 
 
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 295ceeaeab..1355d7f743 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -1,6 +1,4 @@
-#################################
-# Start SUBSYSTEM LIBNET
-[LIBRARY::LIBNET]
+[LIBRARY::LIBSAMBA-NET]
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = User-friendly access to Samba interfaces
@@ -27,5 +25,3 @@ OBJ_FILES = \
 		userman.o \
 		domain.o 
 REQUIRED_SUBSYSTEMS = dcerpc RPC_NDR_SAMR RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel
-# End SUBSYSTEM LIBNET
-#################################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 4eb6462de3..44bc09d3a4 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
 		ndr/ndr_basic.o \
 		ndr/ndr_string.o \
 		ndr/ndr_misc.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC LIBBASIC
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBNDR
 ################################################
 
@@ -35,7 +35,6 @@ OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o
 [LIBRARY::NDR_SECURITY]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_security.o
 PUBLIC_HEADERS = gen_ndr/security.h
 REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
@@ -43,71 +42,55 @@ REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
 [LIBRARY::NDR_AUDIOSRV]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DNSSERVER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dnsserver.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINSTATION]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winstation.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_ECHO]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_ECHO]
 OBJ_FILES = gen_ndr/ndr_echo.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_IRPC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_irpc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSBACKUP]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EFS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_MISC]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_MISC]
 OBJ_FILES = gen_ndr/ndr_misc.o
 PUBLIC_HEADERS = gen_ndr/misc.h gen_ndr/ndr_misc.h
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_ROT]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_ROT]
 OBJ_FILES = gen_ndr/ndr_rot.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_LSA]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa.o
 PUBLIC_HEADERS = gen_ndr/lsa.h
 REQUIRED_SUBSYSTEMS = LIBNDR
@@ -115,14 +98,12 @@ REQUIRED_SUBSYSTEMS = LIBNDR
 [LIBRARY::NDR_DFS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DRSUAPI]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
 
@@ -133,35 +114,28 @@ OBJ_FILES = ndr/ndr_drsuapi.o
 [LIBRARY::NDR_DRSBLOBS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_SASL_HELPERS]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_SASL_HELPERS]
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_POLICYAGENT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_UNIXINFO]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SAMR]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr.o
 PUBLIC_HEADERS = gen_ndr/samr.h
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
@@ -169,7 +143,6 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 [LIBRARY::NDR_SPOOLSS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
 
@@ -180,14 +153,12 @@ OBJ_FILES = ndr/ndr_spoolss_buf.o
 [LIBRARY::NDR_WKSSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SRVSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 
@@ -195,91 +166,76 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 VERSION = 0.0.1
 PUBLIC_HEADERS = gen_ndr/svcctl.h
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ATSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EVENTLOG]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EPMAPPER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DBGIDL]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSSETUP]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MSGSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINREG]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
 
 [LIBRARY::NDR_INITSHUTDOWN]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MGMT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_PROTECTED_STORAGE]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_DCOM]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_DCOM]
 OBJ_FILES = gen_ndr/ndr_dcom.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
@@ -287,66 +243,55 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 PRIVATE_PROTO_HEADER = ndr/ndr_orpc.h
 OBJ_FILES = ndr/ndr_orpc.o 
 
-[LIBRARY::NDR_ORPC]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_ORPC]
 OBJ_FILES = gen_ndr/ndr_orpc.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
 
 [LIBRARY::NDR_OXIDRESOLVER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_REMACT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_WZCSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_BROWSER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_browser.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_W32TIME]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SCERPC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NTSVCS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NETLOGON]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon.o
 PUBLIC_HEADERS = gen_ndr/netlogon.h
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
@@ -354,21 +299,16 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 [LIBRARY::NDR_TRKWKS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_KEYSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_KRB5PAC]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_KRB5PAC]
 OBJ_FILES = gen_ndr/ndr_krb5pac.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
 
@@ -379,28 +319,18 @@ OBJ_FILES = ndr/ndr_krb5pac.o
 [LIBRARY::NDR_XATTR]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_xattr.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY
 
-[LIBRARY::NDR_OPENDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_OPENDB]
 OBJ_FILES = gen_ndr/ndr_opendb.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_SCHANNEL]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_SCHANNEL]
 OBJ_FILES = gen_ndr/ndr_schannel.o
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[LIBRARY::NDR_NBT]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::NDR_NBT]
 OBJ_FILES = gen_ndr/ndr_nbt.o
 PUBLIC_HEADERS = gen_ndr/nbt.h
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
@@ -408,7 +338,6 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
 [LIBRARY::NDR_WINSREPL]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
 
@@ -421,7 +350,6 @@ OBJ_FILES = gen_ndr/tables.o
 [LIBRARY::NDR_TABLE]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = rpc/table.o 
 PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
 REQUIRED_SUBSYSTEMS = \
@@ -440,252 +368,214 @@ REQUIRED_SUBSYSTEMS = \
 [LIBRARY::RPC_NDR_ROT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot_c.o
 REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc
 
 [LIBRARY::RPC_NDR_AUDIOSRV]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc
 
 [LIBRARY::RPC_NDR_ECHO]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
 
 [LIBRARY::RPC_NDR_DSBACKUP]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP
 
 [LIBRARY::RPC_NDR_EFS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS
 
 [LIBRARY::RPC_NDR_LSA]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
 
 [LIBRARY::RPC_NDR_DFS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
 
 [LIBRARY::RPC_NDR_DRSUAPI]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
 
 [LIBRARY::RPC_NDR_POLICYAGENT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT
 
 [LIBRARY::RPC_NDR_UNIXINFO]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO
 
 [LIBRARY::RPC_NDR_SAMR]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
 
 [LIBRARY::RPC_NDR_SPOOLSS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
 
 [LIBRARY::RPC_NDR_WKSSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
 
 [LIBRARY::RPC_NDR_SRVSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
 
 [LIBRARY::RPC_NDR_SVCCTL]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
 
 [LIBRARY::RPC_NDR_ATSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC
 
 [LIBRARY::RPC_NDR_EVENTLOG]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
 
 [LIBRARY::RPC_NDR_EPMAPPER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 
 [LIBRARY::RPC_NDR_DBGIDL]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL
 
 [LIBRARY::RPC_NDR_DSSETUP]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP
 
 [LIBRARY::RPC_NDR_MSGSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC
 
 [LIBRARY::RPC_NDR_WINS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS
 
 [LIBRARY::RPC_NDR_WINREG]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
 
 [LIBRARY::RPC_NDR_INITSHUTDOWN]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
 
 [LIBRARY::RPC_NDR_MGMT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT
 
 [LIBRARY::RPC_NDR_PROTECTED_STORAGE]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE
 
-[LIBRARY::DCOM_PROXY_DCOM]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION =
+[SUBSYSTEM::DCOM_PROXY_DCOM]
 OBJ_FILES = gen_ndr/ndr_dcom_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM
 
 [LIBRARY::RPC_NDR_OXIDRESOLVER]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER
 
 [LIBRARY::RPC_NDR_REMACT]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT
 
 [LIBRARY::RPC_NDR_WZCSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC
 
 [LIBRARY::RPC_NDR_W32TIME]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME
 
 [LIBRARY::RPC_NDR_SCERPC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC
 
 [LIBRARY::RPC_NDR_NTSVCS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS
 
 [LIBRARY::RPC_NDR_NETLOGON]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 REQUIRED_SUBSYSTEMS = NDR_NETLOGON
 
 [LIBRARY::RPC_NDR_TRKWKS]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS
 
 [LIBRARY::RPC_NDR_KEYSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
-DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC
 
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 84c059b947..9723964a4b 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -1,9 +1,5 @@
-#################################
-# Start SUBSYSTEM LIBWINBIND_CLIENT
-[LIBRARY::LIBWINBIND_CLIENT]
+[LIBRARY::LIBWINBIND-CLIENT]
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Client library for communicating with winbind
 OBJ_FILES = wb_common.o
-# End SUBSYSTEM LIBWINBIND_CLIENT
-#################################
diff --git a/source4/param/config.mk b/source4/param/config.mk
index d88d0765e7..45b035b4eb 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -1,9 +1,12 @@
-[SUBSYSTEM::CONFIG]
+[LIBRARY::LIBSAMBA-CONFIG]
+DESCRIPTION = Reading Samba configuration files
+VERSION = 0.0.1
+SO_VERSION = 0
 OBJ_FILES = loadparm.o \
 			params.o \
 			generic.o \
 			../lib/version.o
-REQUIRED_SUBSYSTEMS = LIBBASIC DYNCONFIG
+REQUIRED_SUBSYSTEMS = LIBSAMBA-UTIL DYNCONFIG
 PRIVATE_PROTO_HEADER = proto.h
 
 
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 22437909ed..c169680507 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = ldb
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA
 # End LIBRARY swig_dcerpc
 #######################
 
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ffda803f47..e5a20d20e1 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -73,9 +73,9 @@ OBJ_FILES = \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = \
-		EJS LIBBASIC \
+		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBNET LIBSMB LIBPOPT \
+		LIBSAMBA-NET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
@@ -88,6 +88,6 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC smbcalls CONFIG 
+REQUIRED_SUBSYSTEMS = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG 
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 63c0a51937..11e42c3d28 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -125,8 +125,8 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		process_model \
 		service \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		PIDFILE \
 		POPT_SAMBA \
 		LIBPOPT
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 1cd0ad3303..a19b580e22 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -16,8 +16,8 @@ REQUIRED_SUBSYSTEMS = \
 		TORTURE_NBENCH \
 		TORTURE_LDAP \
 		TORTURE_NBT \
-		CONFIG \
-		LIBBASIC
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL
 
 [SUBSYSTEM::TORTURE_UTIL]
 OBJ_FILES = torture_util.o
@@ -151,7 +151,7 @@ REQUIRED_SUBSYSTEMS = \
 		RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
 		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
 		RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBNET
+		RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
@@ -241,7 +241,7 @@ OBJ_FILES = \
 		libnet/libnet_share.o \
 		libnet/libnet_rpc.o
 REQUIRED_SUBSYSTEMS = \
-		LIBNET
+		LIBSAMBA-NET
 # End SUBSYSTEM TORTURE_NET
 #################################
 
@@ -267,8 +267,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		gentest.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
@@ -284,8 +284,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		masktest.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS \
@@ -302,8 +302,8 @@ OBJ_FILES = \
 		locktest.o
 REQUIRED_SUBSYSTEMS = \
 		LIBSMB \
-		CONFIG \
-		LIBBASIC
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL
 MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 0a1139de2b..a7ca518095 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -7,8 +7,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		ndrdump.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBPOPT \
 		POPT_SAMBA \
 		NDR_TABLE
@@ -24,8 +24,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		ntlm_auth.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS
@@ -41,8 +41,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		getntacl.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		NDR_XATTR \
 		EXT_LIB_XATTR
 # End BINARY getntacl
@@ -76,8 +76,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		nmblookup.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBCLI_NBT \
 		LIBPOPT \
 		POPT_SAMBA \
@@ -92,8 +92,8 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
 		testparm.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
 		LIBPOPT \
 		SOCKET \
 		POPT_SAMBA
diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index 3d45bcec77..19632b25ef 100644
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -13,9 +13,9 @@ OBJ_FILES = \
 		net_vampire.o \
 		net_user.o
 REQUIRED_SUBSYSTEMS = \
-		CONFIG \
-		LIBBASIC \
-		LIBNET \
+		LIBSAMBA-CONFIG \
+		LIBSAMBA-UTIL \
+		LIBSAMBA-NET \
 		LIBPOPT \
 		POPT_SAMBA \
 		POPT_CREDENTIALS