summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-24 15:47:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:18 -0500
commit69b51f702af1ded825d5c17bdb97014cac12e752 (patch)
tree2aaae15c6b5cf81298442501c2f7c3cfaa761221
parent758946429e8cef84ebc00e02f6fa0fb93a642aa8 (diff)
downloadsamba-69b51f702af1ded825d5c17bdb97014cac12e752.tar.gz
samba-69b51f702af1ded825d5c17bdb97014cac12e752.tar.bz2
samba-69b51f702af1ded825d5c17bdb97014cac12e752.zip
r15207: Introduce PRIVATE_DEPENDENCIES and PUBLIC_DEPENDENCIES as replacement
for REQUIRED_SUBSYSTEMS. (This used to be commit adc8a019b6da256f104abed1b82bfde6998a2ac9)
-rw-r--r--source4/auth/config.mk8
-rw-r--r--source4/auth/credentials/config.mk2
-rw-r--r--source4/auth/gensec/config.mk8
-rw-r--r--source4/auth/kerberos/config.mk2
-rw-r--r--source4/auth/ntlmssp/config.mk2
-rw-r--r--source4/build/m4/public.m42
-rw-r--r--source4/build/smb_build/config_mk.pm11
-rw-r--r--source4/build/smb_build/input.pm10
-rw-r--r--source4/cldap_server/config.mk2
-rw-r--r--source4/client/config.mk4
-rw-r--r--source4/dsdb/config.mk2
-rw-r--r--source4/dsdb/samdb/ldb_modules/config.mk8
-rw-r--r--source4/gtk/config.mk10
-rw-r--r--source4/heimdal_build/config.mk14
-rw-r--r--source4/kdc/config.mk4
-rw-r--r--source4/ldap_server/config.mk2
-rw-r--r--source4/lib/appweb/config.mk4
-rw-r--r--source4/lib/basic.mk2
-rw-r--r--source4/lib/charset/config.mk2
-rw-r--r--source4/lib/cmdline/config.mk4
-rw-r--r--source4/lib/com/config.mk2
-rw-r--r--source4/lib/events/config.mk2
-rw-r--r--source4/lib/ldb/config.mk32
-rw-r--r--source4/lib/messaging/config.mk2
-rw-r--r--source4/lib/registry/config.mk34
-rw-r--r--source4/lib/replace/config.mk2
-rw-r--r--source4/lib/socket/config.mk8
-rw-r--r--source4/lib/talloc/config.mk2
-rw-r--r--source4/lib/tdb/config.mk12
-rw-r--r--source4/lib/tdr/config.mk2
-rw-r--r--source4/lib/tls/config.mk2
-rw-r--r--source4/lib/util/config.mk2
-rw-r--r--source4/libcli/auth/config.mk2
-rw-r--r--source4/libcli/config.mk26
-rw-r--r--source4/libcli/ldap/config.mk2
-rw-r--r--source4/libcli/security/config.mk2
-rw-r--r--source4/libcli/smb2/config.mk2
-rw-r--r--source4/libnet/config.mk2
-rw-r--r--source4/librpc/config.mk218
-rw-r--r--source4/nbt_server/config.mk10
-rw-r--r--source4/ntptr/config.mk4
-rw-r--r--source4/ntvfs/common/config.mk2
-rw-r--r--source4/ntvfs/config.mk6
-rw-r--r--source4/ntvfs/posix/config.mk2
-rw-r--r--source4/ntvfs/sysdep/config.mk2
-rw-r--r--source4/ntvfs/unixuid/config.mk2
-rw-r--r--source4/param/config.mk2
-rw-r--r--source4/passdb/config.mk2
-rw-r--r--source4/rpc_server/config.mk30
-rw-r--r--source4/scripting/ejs/config.mk8
-rw-r--r--source4/scripting/swig/config.mk2
-rw-r--r--source4/smb_server/config.mk2
-rw-r--r--source4/smb_server/smb/config.mk2
-rw-r--r--source4/smb_server/smb2/config.mk2
-rw-r--r--source4/smbd/config.mk24
-rw-r--r--source4/smbd/process_model.mk4
-rw-r--r--source4/torture/config.mk28
-rw-r--r--source4/torture/local/config.mk2
-rw-r--r--source4/torture/smb2/config.mk2
-rw-r--r--source4/utils/config.mk13
-rw-r--r--source4/utils/net/config.mk2
-rw-r--r--source4/web_server/config.mk2
-rw-r--r--source4/winbind/config.mk4
-rw-r--r--source4/wrepl_server/config.mk2
64 files changed, 310 insertions, 310 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 03edc8a68b..9ce50ab978 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -14,7 +14,7 @@ INIT_FUNCTION = auth_sam_init
SUBSYSTEM = auth
OBJ_FILES = \
auth_sam.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SAMDB
# End MODULE auth_sam
#######################
@@ -36,7 +36,7 @@ INIT_FUNCTION = auth_winbind_init
SUBSYSTEM = auth
OBJ_FILES = \
auth_winbind.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBWINBIND-CLIENT \
NDR_NETLOGON LIBNDR
# End MODULE auth_winbind
@@ -59,7 +59,7 @@ INIT_FUNCTION = auth_unix_init
SUBSYSTEM = auth
OBJ_FILES = \
auth_unix.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
EXT_LIB_CRYPT EXT_LIB_PAM PAM_ERRORS
# End MODULE auth_unix
#######################
@@ -79,6 +79,6 @@ OBJ_FILES = \
auth_sam_reply.o \
ntlm_check.o \
auth_simple.o
-REQUIRED_SUBSYSTEMS = LIB_SECURITY process_model
+PUBLIC_DEPENDENCIES = LIB_SECURITY process_model
# End SUBSYSTEM auth
#######################
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index dbf20156fa..b1212e5963 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -7,7 +7,7 @@ OBJ_FILES = credentials.o \
credentials_files.o \
credentials_krb5.o \
credentials_ntlm.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
HEIMDAL LIBCLI_AUTH ldb SECRETS
# End SUBSYSTEM CREDENTIALS
#################################
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index b01d1283ae..38351c7efb 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -7,7 +7,7 @@ DESCRIPTION = Generic Security Library
PUBLIC_HEADERS = gensec.h spnego.h
PUBLIC_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
CREDENTIALS LIBSAMBA-UTIL
# End SUBSYSTEM gensec
#################################
@@ -18,7 +18,7 @@ REQUIRED_SUBSYSTEMS = \
SUBSYSTEM = gensec
INIT_FUNCTION = gensec_krb5_init
OBJ_FILES = gensec_krb5.o
-REQUIRED_SUBSYSTEMS = KERBEROS auth auth_sam
+PUBLIC_DEPENDENCIES = KERBEROS auth auth_sam
# End MODULE gensec_krb5
################################################
@@ -28,7 +28,7 @@ REQUIRED_SUBSYSTEMS = KERBEROS auth auth_sam
SUBSYSTEM = gensec
INIT_FUNCTION = gensec_gssapi_init
OBJ_FILES = gensec_gssapi.o
-REQUIRED_SUBSYSTEMS = KERBEROS auth
+PUBLIC_DEPENDENCIES = KERBEROS auth
# End MODULE gensec_gssapi
################################################
@@ -51,7 +51,7 @@ PRIVATE_PROTO_HEADER = schannel_proto.h
INIT_FUNCTION = gensec_schannel_init
OBJ_FILES = schannel.o \
schannel_sign.o
-REQUIRED_SUBSYSTEMS = auth SCHANNELDB NDR_SCHANNEL
+PUBLIC_DEPENDENCIES = auth SCHANNELDB NDR_SCHANNEL
OUTPUT_TYPE = MERGEDOBJ
# End MODULE gensec_schannel
################################################
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index dbab322511..bce6c97848 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -9,6 +9,6 @@ OBJ_FILES = kerberos.o \
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-REQUIRED_SUBSYSTEMS = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET
# End SUBSYSTEM KERBEROS
#################################
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 07b1fad1c7..fc9ccd91f6 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -12,7 +12,7 @@ OBJ_FILES = ntlmssp.o \
ntlmssp_sign.o \
ntlmssp_client.o \
ntlmssp_server.o
-REQUIRED_SUBSYSTEMS = auth MSRPC_PARSE
+PUBLIC_DEPENDENCIES = auth MSRPC_PARSE
OUTPUT_TYPE = MERGEDOBJ
# End MODULE gensec_ntlmssp
################################################
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 5ce976f1ab..00699acc6e 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -30,7 +30,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
# Start Subsystem $1
@<:@SUBSYSTEM::$1@:>@
OBJ_FILES = $2
-REQUIRED_SUBSYSTEMS = $3
+PRIVATE_DEPENDENCIES = $3
ENABLE = YES
# End Subsystem $1
###################################
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index fa948f4bd9..79107c1c9b 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -22,7 +22,8 @@ my $section_types = {
"SUBSYSTEM" => {
"OBJ_FILES" => "list",
- "REQUIRED_SUBSYSTEMS" => "list",
+ "PRIVATE_DEPENDENCIES" => "list",
+ "PUBLIC_DEPENDENCIES" => "list",
"ENABLE" => "bool",
@@ -42,7 +43,8 @@ my $section_types = {
"INIT_FUNCTION" => "string",
"OBJ_FILES" => "list",
- "REQUIRED_SUBSYSTEMS" => "list",
+ "PUBLIC_DEPENDENCIES" => "list",
+ "PRIVATE_DEPENDENCIES" => "list",
"ALIASES" => "list",
@@ -58,7 +60,7 @@ my $section_types = {
"BINARY" => {
"OBJ_FILES" => "list",
- "REQUIRED_SUBSYSTEMS" => "list",
+ "PRIVATE_DEPENDENCIES" => "list",
"ENABLE" => "bool",
@@ -82,7 +84,8 @@ my $section_types = {
"DESCRIPTION" => "string",
- "REQUIRED_SUBSYSTEMS" => "list",
+ "PRIVATE_DEPENDENCIES" => "list",
+ "PUBLIC_DEPENDENCIES" => "list",
"ENABLE" => "bool",
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 704dafa371..6d9b3f5aac 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -74,10 +74,10 @@ sub check_module($$$)
if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
- push (@{$mod->{REQUIRED_SUBSYSTEMS}}, $mod->{SUBSYSTEM}) unless
+ push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM}) unless
$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "BINARY";
} else {
- push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
+ push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
}
}
@@ -197,12 +197,14 @@ sub check($$$$$)
# Generate list of dependencies
$part->{DEPENDENCIES} = [];
- foreach my $key (@{$part->{REQUIRED_SUBSYSTEMS}}) {
+ foreach my $key (@{$part->{PUBLIC_DEPENDENCIES}},
+ @{$part->{PRIVATE_DEPENDENCIES}}) {
die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
push (@{$part->{DEPENDENCIES}}, \$depend{$key});
}
- delete ($part->{REQUIRED_SUBSYSTEMS});
+ delete ($part->{PRIVATE_DEPENDENCIES});
+ delete ($part->{PUBLIC_DEPENDENCIES});
}
foreach my $part (values %depend) {
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index 2b037baec3..00c0ef4f03 100644
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -7,7 +7,7 @@ PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = \
cldap_server.o \
netlogon.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_CLDAP LIBNETIF process_model
# End SUBSYSTEM CLDAPD
#######################
diff --git a/source4/client/config.mk b/source4/client/config.mk
index d05b890ff6..369d2a658a 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -6,7 +6,7 @@
INSTALLDIR = BINDIR
OBJ_FILES = \
client.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBREADLINE \
LIBSAMBA-UTIL \
@@ -26,7 +26,7 @@ INSTALLDIR = BINDIR
OBJ_FILES = \
cifsdd.o \
cifsddio.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSMB \
LIBPOPT \
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 7537e53300..15aa9fd0aa 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -7,7 +7,7 @@ include samdb/ldb_modules/config.mk
[SUBSYSTEM::SAMDB]
PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_HEADERS = samdb/samdb.h
-REQUIRED_SUBSYSTEMS = DB_WRAP LIBCLI_LDAP
+PUBLIC_DEPENDENCIES = DB_WRAP LIBCLI_LDAP
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index c7ac5816e1..207fdf8201 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -5,7 +5,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = objectguid_module_init
OBJ_FILES = \
objectguid.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBNDR NDR_MISC
# End MODULE ldb_objectguid
################################################
@@ -17,7 +17,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = samldb_module_init
OBJ_FILES = \
samldb.o
-REQUIRED_SUBSYSTEMS = SAMDB
+PUBLIC_DEPENDENCIES = SAMDB
#
# End MODULE ldb_samldb
################################################
@@ -64,7 +64,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = password_hash_module_init
OBJ_FILES = \
password_hash.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
HEIMDAL_HDB HEIMDAL_KRB5
#
# End MODULE ldb_rootdse
@@ -77,7 +77,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = ldb_kludge_acl_init
OBJ_FILES = \
kludge_acl.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIB_SECURITY
#
# End MODULE ldb_rootdse
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index b2d2ac2ac4..42511df8be 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -9,28 +9,28 @@ OBJ_FILES = common/gtk-smb.o \
common/select.o \
common/gtk_events.o \
common/credentials.o
-REQUIRED_SUBSYSTEMS = CHARSET LIBSAMBA-UTIL EXT_LIB_gtk RPC_NDR_SAMR
+PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL EXT_LIB_gtk RPC_NDR_SAMR
[BINARY::gregedit]
INSTALLDIR = BINDIR
OBJ_FILES = tools/gregedit.o
-REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG registry gtksamba
+PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG registry gtksamba
MANPAGE = man/gregedit.1
[BINARY::gepdump]
INSTALLDIR = BINDIR
MANPAGE = man/gepdump.1
OBJ_FILES = tools/gepdump.o
-REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG gtksamba RPC_NDR_EPMAPPER RPC_NDR_MGMT
+PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG gtksamba RPC_NDR_EPMAPPER RPC_NDR_MGMT
[BINARY::gwcrontab]
INSTALLDIR = BINDIR
MANPAGE = man/gwcrontab.1
OBJ_FILES = tools/gwcrontab.o
-REQUIRED_SUBSYSTEMS = LIBSAMBA-CONFIG gtksamba RPC_NDR_ATSVC
+PRIVATE_DEPENDENCIES = 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 = LIBSAMBA-CONFIG RPC_NDR_SAMR gtksamba
+PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG RPC_NDR_SAMR gtksamba
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 075f902cc9..3257d8e340 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -40,7 +40,7 @@ OBJ_FILES = \
../heimdal/lib/hdb/asn1_Salt.o \
../heimdal/lib/hdb/asn1_hdb_entry.o \
../heimdal/lib/hdb/hdb_err.o
-REQUIRED_SUBSYSTEMS = HDB_LDB
+PUBLIC_DEPENDENCIES = HDB_LDB
# End SUBSYSTEM HEIMDAL_HDB
#######################
@@ -87,7 +87,7 @@ OBJ_FILES = \
../heimdal/lib/gssapi/get_mic.o \
../heimdal/lib/gssapi/import_name.o \
../heimdal/lib/gssapi/init.o
-REQUIRED_SUBSYSTEMS = KERBEROS HEIMDAL_KRB5
+PUBLIC_DEPENDENCIES = KERBEROS HEIMDAL_KRB5
# End SUBSYSTEM HEIMDAL_GSSAPI
#######################
@@ -338,7 +338,7 @@ OBJ_FILES = \
../heimdal/lib/roken/strupr.o \
../heimdal/lib/roken/strpool.o \
replace.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
HEIMDAL_ROKEN_ADDRINFO \
HEIMDAL_ROKEN_GAI_STRERROR \
HEIMDAL_ROKEN_INET_ATON \
@@ -350,7 +350,7 @@ REQUIRED_SUBSYSTEMS = \
# Start SUBSYSTEM HEIMDAL_GLUE
[SUBSYSTEM::HEIMDAL_GLUE]
OBJ_FILES = glue.o
-REQUIRED_SUBSYSTEMS = LIBNETIF
+PUBLIC_DEPENDENCIES = LIBNETIF
# End SUBSYSTEM HEIMDAL_GLUE
#######################
@@ -466,7 +466,7 @@ EXTRA_CFLAGS = \
-Iheimdal/lib/des -Iheimdal/lib/roken \
-DNO_PRINTF_ATTRIBUTE
OBJ_FILES = ../heimdal/lib/vers/print_version.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN \
HEIMDAL_COM_ERR HEIMDAL_GLUE EXT_LIB_RESOLV
@@ -476,8 +476,8 @@ REQUIRED_SUBSYSTEMS = \
#######################
# Start SUBSYSTEM KERBEROS_LIB
[SUBSYSTEM::KERBEROS_LIB]
-#REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5
-REQUIRED_SUBSYSTEMS = HEIMDAL
+#PUBLIC_DEPENDENCIES = EXT_LIB_KRB5
+PUBLIC_DEPENDENCIES = HEIMDAL
# End SUBSYSTEM KERBEROS_LIB
#######################
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 2a2e6f12e6..76a37be3d8 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -6,7 +6,7 @@
OBJ_FILES = \
kdc.o \
kpasswdd.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ldb KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB SAMDB
# End SUBSYSTEM KDC
#######################
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = \
OBJ_FILES = \
hdb-ldb.o \
pac-glue.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ldb KERBEROS_LIB HEIMDAL_HDB auth_sam
# End SUBSYSTEM KDC
#######################
diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 2ef0413b32..7a6ccdc084 100644
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = \
ldap_server.o \
ldap_backend.o \
ldap_bind.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_LDAP SAMDB process_model
# End SUBSYSTEM SMB
#######################
diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index 5362043d3d..df0f81dccb 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -16,7 +16,7 @@ OBJ_FILES = \
ejs/ejsLex.o \
ejs/ejsParser.o \
ejs/ejsProcs.o
-REQUIRED_SUBSYSTEMS = MPR
+PUBLIC_DEPENDENCIES = MPR
# End SUBSYSTEM EJS
#######################
@@ -26,6 +26,6 @@ REQUIRED_SUBSYSTEMS = MPR
OBJ_FILES = \
esp/esp.o \
esp/espProcs.o
-REQUIRED_SUBSYSTEMS = EJS
+PUBLIC_DEPENDENCIES = EJS
# End SUBSYSTEM ESP
#######################
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index d6b355362c..3e4a422c3b 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -59,4 +59,4 @@ PUBLIC_PROTO_HEADER = db_wrap_proto.h
PUBLIC_HEADERS = db_wrap.h
OBJ_FILES = db_wrap.o \
gendb.o
-REQUIRED_SUBSYSTEMS = ldb LIBTDB LDBSAMBA
+PUBLIC_DEPENDENCIES = ldb LIBTDB LDBSAMBA
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 5f423b3ba6..023bd5c588 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -6,6 +6,6 @@ OBJ_FILES = \
charcnv.o
PUBLIC_HEADERS = charset.h
PUBLIC_PROTO_HEADER = charset_proto.h
-REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
+PUBLIC_DEPENDENCIES = EXT_LIB_ICONV
# End SUBSYSTEM CHARSET
################################################
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index cc82ba443e..b97bd75d82 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,7 +1,7 @@
[SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
PRIVATE_PROTO_HEADER = credentials.h
OBJ_FILES = credentials.o
-REQUIRED_SUBSYSTEMS = CREDENTIALS
+PUBLIC_DEPENDENCIES = CREDENTIALS
[SUBSYSTEM::POPT_SAMBA]
PUBLIC_HEADERS = popt_common.h
@@ -10,4 +10,4 @@ OBJ_FILES = popt_common.o
[SUBSYSTEM::POPT_CREDENTIALS]
PRIVATE_PROTO_HEADER = popt_credentials.h
OBJ_FILES = popt_credentials.o
-REQUIRED_SUBSYSTEMS = CREDENTIALS LIBCMDLINE_CREDENTIALS
+PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index de6d598159..08c459a5f6 100644
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -14,7 +14,7 @@ PRIVATE_PROTO_HEADER = dcom/proto.h
OBJ_FILES = \
dcom/main.o \
dcom/tables.o
-REQUIRED_SUBSYSTEMS = com DCOM_PROXY_DCOM RPC_NDR_REMACT \
+PUBLIC_DEPENDENCIES = com DCOM_PROXY_DCOM RPC_NDR_REMACT \
RPC_NDR_OXIDRESOLVER
[MODULE::com_simple]
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 607a7da130..5f770b971b 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -2,6 +2,6 @@
# Start SUBSYSTEM LIBEVENTS
[SUBSYSTEM::LIBEVENTS]
OBJ_FILES = events.o events_standard.o
-REQUIRED_SUBSYSTEMS = LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBTALLOC
# End SUBSYSTEM LIBEVENTS
##############################
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 59c316c8c1..60eb9e8984 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -76,7 +76,7 @@ INIT_FUNCTION = ldb_ildap_init
ALIASES = ldapi ldaps ldap
OBJ_FILES = \
ldb_ildap/ldb_ildap.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_LDAP
# End MODULE ldb_ildap
################################################
@@ -84,7 +84,7 @@ REQUIRED_SUBSYSTEMS = \
################################################
# Start MODULE ldb_map
[SUBSYSTEM::ldb_map]
-REQUIRED_SUBSYSTEMS = ldb
+PUBLIC_DEPENDENCIES = ldb
OBJ_FILES = modules/ldb_map.o
# End MODULE ldb_map
################################################
@@ -105,7 +105,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = ldb_sqlite3_init
OBJ_FILES = \
ldb_sqlite3/ldb_sqlite3.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
EXT_LIB_SQLITE3
# End MODULE ldb_sqlite3
################################################
@@ -122,7 +122,7 @@ OBJ_FILES = \
ldb_tdb/ldb_index.o \
ldb_tdb/ldb_cache.o \
ldb_tdb/ldb_tdb_wrap.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBTDB
# End MODULE ldb_tdb
################################################
@@ -152,7 +152,7 @@ OBJ_FILES = \
common/ldb_dn.o \
common/ldb_controls.o \
common/qsort.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBREPLACE LIBTALLOC
MANPAGE = man/ldb.3
PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
@@ -164,7 +164,7 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
# Start SUBSYSTEM LDBSAMBA
[SUBSYSTEM::LDBSAMBA]
PRIVATE_PROTO_HEADER = samba/ldif_handlers.h
-REQUIRED_SUBSYSTEMS = LIB_SECURITY SAMDB
+PUBLIC_DEPENDENCIES = LIB_SECURITY SAMDB
OBJ_FILES = \
samba/ldif_handlers.o
# End SUBSYSTEM LDBSAMBA
@@ -175,7 +175,7 @@ OBJ_FILES = \
[SUBSYSTEM::LIBLDB_CMDLINE]
OBJ_FILES= \
tools/cmdline.o
-REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS
# End SUBSYSTEM LIBLDB_CMDLINE
################################################
@@ -185,7 +185,7 @@ REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS
INSTALLDIR = BINDIR
OBJ_FILES = \
tools/ldbadd.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbadd.1
# End BINARY ldbadd
@@ -197,7 +197,7 @@ MANPAGE = man/ldbadd.1
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/ldbdel.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbdel.1
# End BINARY ldbdel
@@ -209,7 +209,7 @@ MANPAGE = man/ldbdel.1
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/ldbmodify.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbmodify.1
# End BINARY ldbmodify
@@ -221,7 +221,7 @@ MANPAGE = man/ldbmodify.1
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/ldbsearch.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbsearch.1
# End BINARY ldbsearch
@@ -233,7 +233,7 @@ MANPAGE = man/ldbsearch.1
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/ldbedit.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbedit.1
# End BINARY ldbedit
@@ -245,7 +245,7 @@ MANPAGE = man/ldbedit.1
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/ldbrename.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
MANPAGE = man/ldbrename.1
# End BINARY ldbrename
@@ -256,7 +256,7 @@ MANPAGE = man/ldbrename.1
[BINARY::ldbtest]
OBJ_FILES= \
tools/ldbtest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
# End BINARY ldbtest
################################################
@@ -268,7 +268,7 @@ INSTALLDIR = BINDIR
MANPAGE = man/oLschema2ldif.1
OBJ_FILES= \
tools/oLschema2ldif.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
# End BINARY oLschema2ldif
################################################
@@ -276,7 +276,7 @@ REQUIRED_SUBSYSTEMS = \
#######################
# Start LIBRARY swig_ldb
[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+PUBLIC_DEPENDENCIES = ldb DYNCONFIG
LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
OBJ_FILES = swig/ldb_wrap.o
# End LIBRARY swig_ldb
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 62a120907f..2e56cda1e6 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -4,7 +4,7 @@
[SUBSYSTEM::MESSAGING]
OBJ_FILES = \
messaging.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
NDR_IRPC \
UNIX_PRIVS
# End SUBSYSTEM MESSAGING
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 2693f7dde3..6cf2f50268 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -7,12 +7,12 @@ INIT_FUNCTION = registry_nt4_init
SUBSYSTEM = registry
OBJ_FILES = \
reg_backend_nt4.o
-REQUIRED_SUBSYSTEMS = TDR_REGF
+PUBLIC_DEPENDENCIES = TDR_REGF
# End MODULE registry_nt4
################################################
[SUBSYSTEM::TDR_REGF]
-REQUIRED_SUBSYSTEMS = TDR
+PUBLIC_DEPENDENCIES = TDR
OBJ_FILES = tdr_regf.o
# Special support for external builddirs
@@ -44,7 +44,7 @@ INIT_FUNCTION = registry_dir_init
SUBSYSTEM = registry
OBJ_FILES = \
reg_backend_dir.o
-REQUIRED_SUBSYSTEMS = LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBTALLOC
# End MODULE registry_dir
################################################
@@ -57,7 +57,7 @@ OUTPUT_TYPE = MERGEDOBJ
SUBSYSTEM = registry
OBJ_FILES = \
reg_backend_rpc.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
+PUBLIC_DEPENDENCIES = RPC_NDR_WINREG
# End MODULE registry_rpc
################################################
@@ -70,7 +70,7 @@ INIT_FUNCTION = registry_gconf_init
SUBSYSTEM = registry
OBJ_FILES = \
reg_backend_gconf.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
+PUBLIC_DEPENDENCIES = EXT_LIB_gconf
# End MODULE registry_gconf
################################################
@@ -81,7 +81,7 @@ INIT_FUNCTION = registry_ldb_init
SUBSYSTEM = registry
OBJ_FILES = \
reg_backend_ldb.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ldb
# End MODULE registry_ldb
################################################
@@ -97,7 +97,7 @@ OBJ_FILES = \
common/reg_util.o \
reg_samba.o \
patchfile.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL
PRIVATE_PROTO_HEADER = registry_proto.h
PUBLIC_HEADERS = registry.h
@@ -108,9 +108,8 @@ PUBLIC_HEADERS = registry.h
# Start BINARY regdiff
[BINARY::regdiff]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/regdiff.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regdiff.o
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
MANPAGE = man/regdiff.1
# End BINARY regdiff
@@ -120,9 +119,8 @@ MANPAGE = man/regdiff.1
# Start BINARY regpatch
[BINARY::regpatch]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/regpatch.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regpatch.o
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
MANPAGE = man/regpatch.1
# End BINARY regpatch
@@ -132,9 +130,8 @@ MANPAGE = man/regpatch.1
# Start BINARY regshell
[BINARY::regshell]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/regshell.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regshell.o
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
MANPAGE = man/regshell.1
# End BINARY regshell
@@ -144,9 +141,8 @@ MANPAGE = man/regshell.1
# Start BINARY regtree
[BINARY::regtree]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/regtree.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regtree.o
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
MANPAGE = man/regtree.1
# End BINARY regtree
diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 002fd3b1c4..bc1301984a 100644
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -13,7 +13,7 @@ OBJ_FILES = replace.o \
snprintf.o \
dlfcn.o \
getpass.o
-REQUIRED_SUBSYSTEMS = REPLACE_READDIR
+PUBLIC_DEPENDENCIES = REPLACE_READDIR
# End SUBSYSTEM LIBREPLACE
##############################
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index d5ae81d837..db60a8bf9f 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -6,7 +6,7 @@ SUBSYSTEM = SOCKET
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_ipv4.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
# End MODULE socket_ipv4
################################################
@@ -17,7 +17,7 @@ SUBSYSTEM = SOCKET
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_ipv6.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
# End MODULE socket_ipv6
################################################
@@ -28,7 +28,7 @@ SUBSYSTEM = SOCKET
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
socket_unix.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
+PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET
# End MODULE socket_unix
################################################
@@ -40,6 +40,6 @@ OBJ_FILES = \
access.o \
connect_multi.o \
connect.o
-REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
# End SUBSYSTEM SOCKET
################################################
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 95d3ac359d..8c704520f5 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -4,7 +4,7 @@
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = talloc.o
-REQUIRED_SUBSYSTEMS = LIBREPLACE
+PUBLIC_DEPENDENCIES = LIBREPLACE
MANPAGE = talloc.3
PUBLIC_HEADERS = talloc.h
DESCRIPTION = A hierarchical pool based memory system with destructors
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 3cb9b793ad..b1e6e82d74 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = \
common/tdb.o common/dump.o common/io.o common/lock.o \
common/open.o common/traverse.o common/freelist.o \
common/error.o common/transaction.o common/tdbutil.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBREPLACE
PUBLIC_HEADERS = include/tdb.h
#
@@ -22,7 +22,7 @@ INSTALLDIR = BINDIR
ENABLE = NO
OBJ_FILES= \
tools/tdbtool.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbtool
################################################
@@ -33,7 +33,7 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/tdbtorture.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbtorture
################################################
@@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES= \
tools/tdbdump.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbdump
################################################
@@ -56,7 +56,7 @@ INSTALLDIR = BINDIR
ENABLE = NO
OBJ_FILES= \
tools/tdbbackup.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBTDB
# End BINARY tdbbackup
################################################
@@ -66,6 +66,6 @@ REQUIRED_SUBSYSTEMS = \
[LIBRARY::swig_tdb]
LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
OBJ_FILES = swig/tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
# End LIBRARY swig_tdb
#######################
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index 115f8f8726..d4ad50ed1b 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 LIBSAMBA-UTIL
+PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
OBJ_FILES = tdr.o
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index 810dc17d2d..e68636e700 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -4,7 +4,7 @@
OBJ_FILES = \
tls.o \
tlscert.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG
#
# End SUBSYSTEM LIBTLS
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index c598d703c5..89e2a4c048 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -31,7 +31,7 @@ OBJ_FILES = xfile.o \
mutex.o \
idtree.o \
module.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \
SOCKET_WRAPPER \
# for the base64 functions
diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 3f036fbfd4..756ea0ecbf 100644
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -7,7 +7,7 @@ OBJ_FILES = credentials.o \
session.o \
smbencrypt.o \
smbdes.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
auth SCHANNELDB MSRPC_PARSE
# End SUBSYSTEM LIBCLI_AUTH
#################################
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 380beac287..e646985a78 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -18,13 +18,13 @@ OBJ_FILES = util/asn1.o
[SUBSYSTEM::LIBCLI_LSA]
PRIVATE_PROTO_HEADER = util/clilsa.h
OBJ_FILES = util/clilsa.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
+PUBLIC_DEPENDENCIES = RPC_NDR_LSA
[SUBSYSTEM::LIBCLI_COMPOSITE]
PRIVATE_PROTO_HEADER = composite/proto.h
OBJ_FILES = \
composite/composite.o
-REQUIRED_SUBSYSTEMS = LIBEVENTS
+PUBLIC_DEPENDENCIES = LIBEVENTS
[SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
PRIVATE_PROTO_HEADER = smb_composite/proto.h
@@ -36,7 +36,7 @@ OBJ_FILES = \
smb_composite/fetchfile.o \
smb_composite/appendacl.o \
smb_composite/fsinfo.o
-REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
+PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE
[SUBSYSTEM::NDR_NBT_BUF]
PRIVATE_PROTO_HEADER = nbt/nbtname.h
@@ -53,7 +53,7 @@ OBJ_FILES = \
nbt/nameregister.o \
nbt/namerefresh.o \
nbt/namerelease.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
NDR_SECURITY
[SUBSYSTEM::LIBCLI_DGRAM]
@@ -63,7 +63,7 @@ OBJ_FILES = \
dgram/netlogon.o \
dgram/ntlogon.o \
dgram/browse.o
-REQUIRED_SUBSYSTEMS = LIBCLI_NBT
+PUBLIC_DEPENDENCIES = LIBCLI_NBT
[LIBRARY::LIBCLI_CLDAP]
VERSION = 0.0.1
@@ -71,7 +71,7 @@ SO_VERSION = 0
DESCRIPTION = CLDAP client library
OBJ_FILES = cldap/cldap.o
PUBLIC_HEADERS = cldap/cldap.h
-REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
+PUBLIC_DEPENDENCIES = LIBCLI_LDAP
[LIBRARY::LIBCLI_WREPL]
PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
@@ -80,7 +80,7 @@ SO_VERSION = 0
DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
-REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBEVENTS
[SUBSYSTEM::LIBCLI_RESOLVE]
PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -90,25 +90,25 @@ OBJ_FILES = \
resolve/bcast.o \
resolve/wins.o \
resolve/host.o
-REQUIRED_SUBSYSTEMS = LIBCLI_NBT LIBNETIF
+PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNETIF
[SUBSYSTEM::LIBCLI_FINDDCS]
PRIVATE_PROTO_HEADER = finddcs.h
OBJ_FILES = \
finddcs.o
-REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
+PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
[LIBRARY::LIBCLI]
PUBLIC_HEADERS = libcli.h
VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION = SMB/CIFS client library
-REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
+PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
[SUBSYSTEM::LIBSMB]
-REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
+PUBLIC_DEPENDENCIES = LIBCLI SOCKET
PUBLIC_PROTO_HEADER = libcli_proto.h
OBJ_FILES = clireadwrite.o \
cliconnect.o \
@@ -120,7 +120,7 @@ OBJ_FILES = clireadwrite.o \
[SUBSYSTEM::LIBCLI_RAW]
PRIVATE_PROTO_HEADER = raw/raw_proto.h
-REQUIRED_SUBSYSTEMS = LIBCLI_RAW_KRB5
+PUBLIC_DEPENDENCIES = LIBCLI_RAW_KRB5
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \
raw/clisocket.o \
@@ -142,6 +142,6 @@ OBJ_FILES = raw/rawfile.o \
raw/rawacl.o \
raw/rawdate.o \
raw/rawlpq.o
-REQUIRED_SUBSYSTEMS = LIBPACKET gensec
+PUBLIC_DEPENDENCIES = LIBPACKET gensec
include smb2/config.mk
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index f59da733eb..26f230d7ef 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -10,7 +10,7 @@ OBJ_FILES = ldap.o \
ldap_ndr.o \
ldap_ildap.o \
ldap_controls.o
-REQUIRED_SUBSYSTEMS = LIBSAMBA-ERRORS LIBEVENTS gensec SOCKET NDR_SAMR LIBTLS \
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS gensec SOCKET NDR_SAMR LIBTLS \
LIBPACKET ASN1_UTIL
# End SUBSYSTEM LIBCLI_LDAP
#################################
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 3202def26c..fb4f1f71b7 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -8,6 +8,6 @@ OBJ_FILES = security_token.o \
access_check.o \
privilege.o \
sddl.o
-REQUIRED_SUBSYSTEMS = NDR_SECURITY
+PUBLIC_DEPENDENCIES = NDR_SECURITY
# End SUBSYSTEM LIB_SECURITY
#################################
diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk
index 929a6135fa..4e2e7bb468 100644
--- a/source4/libcli/smb2/config.mk
+++ b/source4/libcli/smb2/config.mk
@@ -19,4 +19,4 @@ OBJ_FILES = \
tdis.o \
flush.o \
keepalive.o
-REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET gensec
+PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBPACKET gensec
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 1355d7f743..05f170cbde 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -24,4 +24,4 @@ OBJ_FILES = \
userinfo.o \
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
+PUBLIC_DEPENDENCIES = 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
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index c75ed9e671..16e655244d 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 = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL
# End SUBSYSTEM LIBNDR
################################################
@@ -24,7 +24,7 @@ DESCRIPTION = NDR support for compressed subcontexts
PRIVATE_PROTO_HEADER = ndr/ndr_compression.h
OBJ_FILES = \
ndr/ndr_compression.o
-REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
+PUBLIC_DEPENDENCIES = LIBCOMPRESSION
# End SUBSYSTEM NDR_COMPRESSION
################################################
@@ -37,75 +37,75 @@ VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_security.o
PUBLIC_HEADERS = gen_ndr/security.h
-REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
+PUBLIC_DEPENDENCIES = NDR_MISC NDR_SECURITY_HELPER
[LIBRARY::NDR_AUDIOSRV]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_audiosrv.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DNSSERVER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dnsserver.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_WINSTATION]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winstation.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_ECHO]
OBJ_FILES = gen_ndr/ndr_echo.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_IRPC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_irpc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DSBACKUP]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dsbackup.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_EFS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_efs.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_MISC]
OBJ_FILES = gen_ndr/ndr_misc.o
PUBLIC_HEADERS = gen_ndr/misc.h gen_ndr/ndr_misc.h
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_ROT]
OBJ_FILES = gen_ndr/ndr_rot.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_LSA]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_lsa.o
PUBLIC_HEADERS = gen_ndr/lsa.h
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DFS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dfs.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DRSUAPI]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_drsuapi.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
[SUBSYSTEM::NDR_DRSUAPI_PRINT]
PRIVATE_PROTO_HEADER = ndr/ndr_drsuapi.h
@@ -115,36 +115,36 @@ OBJ_FILES = ndr/ndr_drsuapi.o
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_drsblobs.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_SASL_HELPERS]
OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_POLICYAGENT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_policyagent.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_UNIXINFO]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_unixinfo.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_SAMR]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_samr.o
PUBLIC_HEADERS = gen_ndr/samr.h
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
[LIBRARY::NDR_SPOOLSS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_spoolss.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF
[SUBSYSTEM::NDR_SPOOLSS_BUF]
PRIVATE_PROTO_HEADER = ndr/ndr_spoolss_buf.h
@@ -154,90 +154,90 @@ OBJ_FILES = ndr/ndr_spoolss_buf.o
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wkssvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_SRVSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_srvsvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL
[LIBRARY::NDR_SVCCTL]
VERSION = 0.0.1
PUBLIC_HEADERS = gen_ndr/svcctl.h
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_svcctl.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_ATSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_atsvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_EVENTLOG]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_eventlog.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_EPMAPPER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_epmapper.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DBGIDL]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dbgidl.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_DSSETUP]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dssetup.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_MSGSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_msgsvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_WINS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wins.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_WINREG]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winreg.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
+PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN
[LIBRARY::NDR_INITSHUTDOWN]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_initshutdown.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_MGMT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_mgmt.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_PROTECTED_STORAGE]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_protected_storage.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_DCOM]
OBJ_FILES = gen_ndr/ndr_dcom.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
[SUBSYSTEM::NDR_ORPC_MANUAL]
PRIVATE_PROTO_HEADER = ndr/ndr_orpc.h
@@ -245,72 +245,72 @@ OBJ_FILES = ndr/ndr_orpc.o
[SUBSYSTEM::NDR_ORPC]
OBJ_FILES = gen_ndr/ndr_orpc.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC_MANUAL
[LIBRARY::NDR_OXIDRESOLVER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_oxidresolver.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
[LIBRARY::NDR_REMACT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_remact.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
[LIBRARY::NDR_WZCSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wzcsvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_BROWSER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_browser.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_W32TIME]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_w32time.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_SCERPC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_scerpc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_NTSVCS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_ntsvcs.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_NETLOGON]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_netlogon.o
PUBLIC_HEADERS = gen_ndr/netlogon.h
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA
[LIBRARY::NDR_TRKWKS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_trkwks.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[LIBRARY::NDR_KEYSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_keysvc.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_KRB5PAC]
OBJ_FILES = gen_ndr/ndr_krb5pac.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
+PUBLIC_DEPENDENCIES = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
[SUBSYSTEM::NDR_KRB5PAC_UTIL]
PRIVATE_PROTO_HEADER = ndr/ndr_krb5pac.h
@@ -320,30 +320,30 @@ OBJ_FILES = ndr/ndr_krb5pac.o
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_xattr.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
[SUBSYSTEM::NDR_OPENDB]
OBJ_FILES = gen_ndr/ndr_opendb.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_NOTIFY]
OBJ_FILES = gen_ndr/ndr_notify.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_SCHANNEL]
OBJ_FILES = gen_ndr/ndr_schannel.o
-REQUIRED_SUBSYSTEMS = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR
[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
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
[LIBRARY::NDR_WINSREPL]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winsrepl.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
@echo Generating librpc/gen_ndr/tables.c
@@ -358,7 +358,7 @@ VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = rpc/table.o
PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
NDR_IFACE_TABLE \
NDR_AUDIOSRV NDR_ECHO NDR_DCERPC \
NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \
@@ -375,219 +375,219 @@ REQUIRED_SUBSYSTEMS = \
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_rot_c.o
-REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc
+PUBLIC_DEPENDENCIES = NDR_ROT dcerpc
[LIBRARY::RPC_NDR_AUDIOSRV]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
-REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc
+PUBLIC_DEPENDENCIES = NDR_AUDIOSRV dcerpc
[LIBRARY::RPC_NDR_ECHO]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_echo_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
+PUBLIC_DEPENDENCIES = dcerpc NDR_ECHO
[LIBRARY::RPC_NDR_DSBACKUP]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP
+PUBLIC_DEPENDENCIES = dcerpc NDR_DSBACKUP
[LIBRARY::RPC_NDR_EFS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_efs_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS
+PUBLIC_DEPENDENCIES = dcerpc NDR_EFS
[LIBRARY::RPC_NDR_LSA]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_lsa_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
+PUBLIC_DEPENDENCIES = dcerpc NDR_LSA
[LIBRARY::RPC_NDR_DFS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dfs_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
+PUBLIC_DEPENDENCIES = dcerpc NDR_DFS
[LIBRARY::RPC_NDR_DRSUAPI]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
+PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI
[LIBRARY::RPC_NDR_POLICYAGENT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_policyagent_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT
+PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT
[LIBRARY::RPC_NDR_UNIXINFO]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO
+PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
[LIBRARY::RPC_NDR_SAMR]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_samr_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
+PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR
[LIBRARY::RPC_NDR_SPOOLSS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_spoolss_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
+PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS
[LIBRARY::RPC_NDR_WKSSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC
[LIBRARY::RPC_NDR_SRVSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC
[LIBRARY::RPC_NDR_SVCCTL]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_svcctl_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
+PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
[LIBRARY::RPC_NDR_ATSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_atsvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
[LIBRARY::RPC_NDR_EVENTLOG]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_eventlog_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
+PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
[LIBRARY::RPC_NDR_EPMAPPER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_epmapper_c.o
-REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
+PUBLIC_DEPENDENCIES = NDR_EPMAPPER
[LIBRARY::RPC_NDR_DBGIDL]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL
+PUBLIC_DEPENDENCIES = dcerpc NDR_DBGIDL
[LIBRARY::RPC_NDR_DSSETUP]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dssetup_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP
+PUBLIC_DEPENDENCIES = dcerpc NDR_DSSETUP
[LIBRARY::RPC_NDR_MSGSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_MSGSVC
[LIBRARY::RPC_NDR_WINS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wins_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS
+PUBLIC_DEPENDENCIES = dcerpc NDR_WINS
[LIBRARY::RPC_NDR_WINREG]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winreg_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
+PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG
[LIBRARY::RPC_NDR_INITSHUTDOWN]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
+PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
[LIBRARY::RPC_NDR_MGMT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_mgmt_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT
+PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
[LIBRARY::RPC_NDR_PROTECTED_STORAGE]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE
+PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE
[SUBSYSTEM::DCOM_PROXY_DCOM]
OBJ_FILES = gen_ndr/ndr_dcom_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM
+PUBLIC_DEPENDENCIES = dcerpc NDR_DCOM
[LIBRARY::RPC_NDR_OXIDRESOLVER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER
+PUBLIC_DEPENDENCIES = dcerpc NDR_OXIDRESOLVER
[LIBRARY::RPC_NDR_REMACT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_remact_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT
+PUBLIC_DEPENDENCIES = dcerpc NDR_REMACT
[LIBRARY::RPC_NDR_WZCSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_WZCSVC
[LIBRARY::RPC_NDR_W32TIME]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_w32time_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME
+PUBLIC_DEPENDENCIES = dcerpc NDR_W32TIME
[LIBRARY::RPC_NDR_SCERPC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_scerpc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC
[LIBRARY::RPC_NDR_NTSVCS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS
+PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS
[LIBRARY::RPC_NDR_NETLOGON]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_netlogon_c.o
-REQUIRED_SUBSYSTEMS = NDR_NETLOGON
+PUBLIC_DEPENDENCIES = NDR_NETLOGON
[LIBRARY::RPC_NDR_TRKWKS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_trkwks_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS
+PUBLIC_DEPENDENCIES = dcerpc NDR_TRKWKS
[LIBRARY::RPC_NDR_KEYSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_keysvc_c.o
-REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC
+PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC
[SUBSYSTEM::NDR_DCERPC]
OBJ_FILES = gen_ndr/ndr_dcerpc.o
-REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
PUBLIC_HEADERS = gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h
################################################
@@ -608,7 +608,7 @@ OBJ_FILES = \
rpc/dcerpc_smb2.o \
rpc/dcerpc_sock.o \
rpc/dcerpc_connect.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SOCKET LIBSMB \
LIBNDR NDR_DCERPC \
RPC_NDR_EPMAPPER \
@@ -621,96 +621,96 @@ REQUIRED_SUBSYSTEMS = \
INIT_FUNCTION = ejs_init_rpcecho
OBJ_FILES = gen_ndr/ndr_echo_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_ECHO EJSRPC
[MODULE::RPC_EJS_MISC]
INIT_FUNCTION = ejs_init_misc
OBJ_FILES = gen_ndr/ndr_misc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_MISC EJSRPC
[MODULE::RPC_EJS_SAMR]
INIT_FUNCTION = ejs_init_samr
OBJ_FILES = gen_ndr/ndr_samr_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC RPC_EJS_LSA RPC_EJS_SECURITY RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR EJSRPC RPC_EJS_LSA RPC_EJS_SECURITY RPC_EJS_MISC
[MODULE::RPC_EJS_SECURITY]
INIT_FUNCTION = ejs_init_security
OBJ_FILES = gen_ndr/ndr_security_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SECURITY EJSRPC
[MODULE::RPC_EJS_LSA]
INIT_FUNCTION = ejs_init_lsarpc
OBJ_FILES = gen_ndr/ndr_lsa_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC RPC_EJS_SECURITY RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_LSA EJSRPC RPC_EJS_SECURITY RPC_EJS_MISC
[MODULE::RPC_EJS_DFS]
INIT_FUNCTION = ejs_init_netdfs
OBJ_FILES = gen_ndr/ndr_dfs_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_DFS EJSRPC
[MODULE::RPC_EJS_DRSUAPI]
INIT_FUNCTION = ejs_init_drsuapi
OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_SPOOLSS]
INIT_FUNCTION = ejs_init_spoolss
OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o
SUBSYSTEM = smbcalls
ENABLE = NO
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS EJSRPC
[MODULE::RPC_EJS_WKSSVC]
INIT_FUNCTION = ejs_init_wkssvc
OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC RPC_EJS_SRVSVC RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC EJSRPC RPC_EJS_SRVSVC RPC_EJS_MISC
[MODULE::RPC_EJS_SRVSVC]
INIT_FUNCTION = ejs_init_srvsvc
OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC RPC_EJS_MISC RPC_EJS_SVCCTL
+PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC EJSRPC RPC_EJS_MISC RPC_EJS_SVCCTL
[MODULE::RPC_EJS_EVENTLOG]
INIT_FUNCTION = ejs_init_eventlog
OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_WINREG]
INIT_FUNCTION = ejs_init_winreg
OBJ_FILES = gen_ndr/ndr_winreg_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC RPC_EJS_INITSHUTDOWN \
+PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG EJSRPC RPC_EJS_INITSHUTDOWN \
RPC_EJS_MISC RPC_EJS_SECURITY
[MODULE::RPC_EJS_INITSHUTDOWN]
INIT_FUNCTION = ejs_init_initshutdown
OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN EJSRPC
[MODULE::RPC_EJS_NETLOGON]
INIT_FUNCTION = ejs_init_netlogon
OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR RPC_EJS_SECURITY RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR RPC_EJS_SECURITY RPC_EJS_MISC
[MODULE::RPC_EJS_SVCCTL]
INIT_FUNCTION = ejs_init_svcctl
OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC RPC_EJS_MISC
+PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_IRPC]
INIT_FUNCTION = ejs_init_irpc
OBJ_FILES = gen_ndr/ndr_irpc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC EJSRPC
+PUBLIC_DEPENDENCIES = dcerpc NDR_IRPC EJSRPC
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 6af0f32e63..51b78aebdc 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -7,7 +7,7 @@ OBJ_FILES = \
wins/winsdb.o \
wins/wins_hook.o
PRIVATE_PROTO_HEADER = wins/winsdb_proto.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ldb
# End SUBSYSTEM WINSDB
#######################
@@ -19,7 +19,7 @@ SUBSYSTEM = ldb
INIT_FUNCTION = wins_ldb_module_init
OBJ_FILES = \
wins/wins_ldb.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBNETIF
# End MODULE ldb_wins_ldb
#######################
@@ -33,7 +33,7 @@ OBJ_FILES = \
wins/winswack.o \
wins/wins_dns_proxy.o
PRIVATE_PROTO_HEADER = wins/winsserver_proto.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_NBT WINSDB
# End SUBSYSTEM NBTD_WINS
#######################
@@ -47,7 +47,7 @@ OBJ_FILES = \
dgram/netlogon.o \
dgram/ntlogon.o \
dgram/browse.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_DGRAM
# End SUBSYSTEM NBTD_DGRAM
#######################
@@ -65,7 +65,7 @@ OBJ_FILES = \
packet.o \
irpc.o
PRIVATE_PROTO_HEADER = nbt_server_proto.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model
# End SUBSYSTEM NBTD
#######################
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index 2aea27f767..e6b84c51d0 100644
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -7,7 +7,7 @@ INIT_FUNCTION = ntptr_simple_ldb_init
SUBSYSTEM = ntptr
OBJ_FILES = \
simple_ldb/ntptr_simple_ldb.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ldb
# End MODULE ntptr_simple_ldb
################################################
@@ -19,7 +19,7 @@ PRIVATE_PROTO_HEADER = ntptr_proto.h
OBJ_FILES = \
ntptr_base.o \
ntptr_interface.o
-REQUIRED_SUBSYSTEMS = DCERPC_COMMON
+PUBLIC_DEPENDENCIES = DCERPC_COMMON
#
# End SUBSYSTEM ntptr
################################################
diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk
index 5b2c8ddba7..feb3613f78 100644
--- a/source4/ntvfs/common/config.mk
+++ b/source4/ntvfs/common/config.mk
@@ -7,6 +7,6 @@ OBJ_FILES = \
brlock.o \
opendb.o \
notify.o
-REQUIRED_SUBSYSTEMS = NDR_OPENDB NDR_NOTIFY sys_notify
+PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify
# End LIBRARY ntvfs_common
################################################
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index d11e2c848d..e17f649abb 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -11,7 +11,7 @@ INIT_FUNCTION = ntvfs_cifs_init
SUBSYSTEM = ntvfs
OBJ_FILES = \
cifs/vfs_cifs.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI
# End MODULE ntvfs_cifs
################################################
@@ -48,7 +48,7 @@ OBJ_FILES = \
ipc/vfs_ipc.o \
ipc/ipc_rap.o \
ipc/rap_server.o
-REQUIRED_SUBSYSTEMS = dcerpc_server
+PUBLIC_DEPENDENCIES = dcerpc_server
# End MODULE ntvfs_ipc
################################################
@@ -77,7 +77,7 @@ OBJ_FILES = \
ntvfs_generic.o \
ntvfs_interface.o \
ntvfs_util.o
-REQUIRED_SUBSYSTEMS =
+PUBLIC_DEPENDENCIES =
#
# End SUBSYSTEM NTVFS
################################################
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index b9724cb9f2..b3c6a54904 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -32,6 +32,6 @@ OBJ_FILES = \
pvfs_notify.o \
xattr_system.o \
xattr_tdb.o
-REQUIRED_SUBSYSTEMS = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID ntvfs_common
+PUBLIC_DEPENDENCIES = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID ntvfs_common
# End MODULE ntvfs_posix
################################################
diff --git a/source4/ntvfs/sysdep/config.mk b/source4/ntvfs/sysdep/config.mk
index 91d739f7b7..dee198c9da 100644
--- a/source4/ntvfs/sysdep/config.mk
+++ b/source4/ntvfs/sysdep/config.mk
@@ -13,6 +13,6 @@ OBJ_FILES = \
[SUBSYSTEM::sys_notify]
OBJ_FILES = \
sys_notify.o
-REQUIRED_SUBSYSTEMS =
+PUBLIC_DEPENDENCIES =
# End SUBSYSTEM sys_notify
################################################
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index f8af68eb9b..a26f96ffad 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/ntvfs/unixuid/config.mk
@@ -5,6 +5,6 @@ INIT_FUNCTION = ntvfs_unixuid_init
SUBSYSTEM = ntvfs
OBJ_FILES = \
vfs_unixuid.o
-REQUIRED_SUBSYSTEMS = SAMDB
+PUBLIC_DEPENDENCIES = SAMDB
# End MODULE ntvfs_unixuid
################################################
diff --git a/source4/param/config.mk b/source4/param/config.mk
index b04dbd3e12..dd338a6421 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -7,6 +7,6 @@ OBJ_FILES = loadparm.o \
generic.o \
util.o \
../lib/version.o
-REQUIRED_SUBSYSTEMS = LIBSAMBA-UTIL DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL DYNCONFIG
PUBLIC_PROTO_HEADER = proto.h
PUBLIC_HEADERS = param.h
diff --git a/source4/passdb/config.mk b/source4/passdb/config.mk
index 09affdf589..0172f57261 100644
--- a/source4/passdb/config.mk
+++ b/source4/passdb/config.mk
@@ -1,4 +1,4 @@
[SUBSYSTEM::SECRETS]
PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = secrets.o
-REQUIRED_SUBSYSTEMS = SAMDB
+PUBLIC_DEPENDENCIES = SAMDB
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index bc752048f8..c187cfdb49 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -24,7 +24,7 @@ OBJ_FILES = \
dcom/rodb.o \
dcom/remact.o \
librpc/gen_ndr/ndr_dcom_d.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON \
dcom
# End MODULE dcerpc_dcom
@@ -37,7 +37,7 @@ INIT_FUNCTION = dcerpc_server_rpcecho_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
echo/rpc_echo.o
-REQUIRED_SUBSYSTEMS = NDR_ECHO
+PUBLIC_DEPENDENCIES = NDR_ECHO
# End MODULE dcerpc_rpcecho
################################################
@@ -48,7 +48,7 @@ INIT_FUNCTION = dcerpc_server_epmapper_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
epmapper/rpc_epmapper.o
-REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
+PUBLIC_DEPENDENCIES = NDR_EPMAPPER
# End MODULE dcerpc_epmapper
################################################
@@ -59,7 +59,7 @@ INIT_FUNCTION = dcerpc_server_remote_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
remote/dcesrv_remote.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB NDR_TABLE
# End MODULE dcerpc_remote
################################################
@@ -71,7 +71,7 @@ INIT_FUNCTION = dcerpc_server_srvsvc_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
srvsvc/dcesrv_srvsvc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON NDR_SRVSVC
# End MODULE dcerpc_srvsvc
################################################
@@ -83,7 +83,7 @@ INIT_FUNCTION = dcerpc_server_wkssvc_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
wkssvc/dcesrv_wkssvc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON NDR_WKSSVC
# End MODULE dcerpc_wkssvc
################################################
@@ -95,7 +95,7 @@ INIT_FUNCTION = dcerpc_server_unixinfo_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
unixinfo/dcesrv_unixinfo.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON \
SAMDB \
NDR_UNIXINFO
@@ -111,7 +111,7 @@ SUBSYSTEM = dcerpc_server
OBJ_FILES = \
samr/dcesrv_samr.o \
samr/samr_password.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SAMDB \
DCERPC_COMMON \
NDR_SAMR
@@ -126,7 +126,7 @@ SUBSYSTEM = dcerpc_server
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
winreg/rpc_winreg.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
registry NDR_WINREG
# End MODULE dcerpc_winreg
################################################
@@ -138,7 +138,7 @@ INIT_FUNCTION = dcerpc_server_netlogon_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
netlogon/dcerpc_netlogon.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON \
SCHANNELDB \
NDR_NETLOGON
@@ -152,7 +152,7 @@ INIT_FUNCTION = dcerpc_server_lsarpc_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
lsa/dcesrv_lsa.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SAMDB \
DCERPC_COMMON \
NDR_LSA
@@ -167,7 +167,7 @@ SUBSYSTEM = dcerpc_server
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
spoolss/dcesrv_spoolss.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
DCERPC_COMMON \
NDR_SPOOLSS \
ntptr
@@ -181,7 +181,7 @@ INIT_FUNCTION = dcerpc_server_drsuapi_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
drsuapi/dcesrv_drsuapi.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SAMDB \
DCERPC_COMMON \
NDR_DRSUAPI
@@ -195,7 +195,7 @@ INIT_FUNCTION = dcerpc_server_dssetup_init
SUBSYSTEM = dcerpc_server
OBJ_FILES = \
dssetup/dcesrv_dssetup.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SAMDB \
DCERPC_COMMON \
NDR_DSSETUP
@@ -215,7 +215,7 @@ OBJ_FILES = \
dcerpc_sock.o \
dcesrv_auth.o \
handles.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_AUTH \
LIBNDR \
dcerpc \
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c38caeabf1..3884b514c6 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -25,7 +25,7 @@ INIT_FUNCTION = smb_setup_ejs_nbt
OBJ_FILES = smbcalls_samba3.o
SUBSYSTEM = smbcalls
INIT_FUNCTION = smb_setup_ejs_samba3
-REQUIRED_SUBSYSTEMS = LIBSAMBA3
+PUBLIC_DEPENDENCIES = LIBSAMBA3
[MODULE::smbcalls_rand]
OBJ_FILES = smbcalls_rand.o
@@ -46,7 +46,7 @@ INIT_FUNCTION = smb_setup_ejs_datablob
OBJ_FILES = smbcalls_auth.o
SUBSYSTEM = smbcalls
INIT_FUNCTION = smb_setup_ejs_auth
-REQUIRED_SUBSYSTEMS = auth
+PUBLIC_DEPENDENCIES = auth
[MODULE::smbcalls_string]
OBJ_FILES = smbcalls_string.o
@@ -73,7 +73,7 @@ OBJ_FILES = \
smbcalls_param.o \
ejsnet.o \
mprutil.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
EJS LIBSAMBA-UTIL \
EJSRPC MESSAGING \
LIBSAMBA-NET LIBSMB LIBPOPT \
@@ -89,6 +89,6 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES = \
smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
# End BINARY SMBSCRIPT
#######################
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index a869446569..2c1c57b0c1 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -2,7 +2,7 @@
# Start LIBRARY swig_dcerpc
[LIBRARY::swig_dcerpc]
LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
OBJ_FILES = dcerpc_wrap.o
# End LIBRARY swig_dcerpc
#######################
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index f460a375f5..85ff3b1080 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = \
session.o \
management.o
PRIVATE_PROTO_HEADER = smb_server_proto.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBPACKET \
SMB_PROTOCOL \
SMB2_PROTOCOL
diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index d4d55b5cdc..3862649388 100644
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -14,7 +14,7 @@ OBJ_FILES = \
srvtime.o \
trans2.o \
signing.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ntvfs LIBPACKET
# End SUBSYSTEM SMB_PROTOCOL
#######################
diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index bc3d418094..5286a4d713 100644
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = \
tcon.o \
fileio.o \
keepalive.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
ntvfs LIBPACKET LIBCLI_SMB2
# End SUBSYSTEM SMB2_PROTOCOL
#######################
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 9f47e20e5e..3033ed1bb0 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -5,7 +5,7 @@
[MODULE::service_auth]
INIT_FUNCTION = server_service_auth_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
auth
# End MODULE server_auth
################################################
@@ -16,7 +16,7 @@ REQUIRED_SUBSYSTEMS = \
INIT_FUNCTION = server_service_smb_init
OUTPUT_TYPE = MERGEDOBJ
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
SMB_SERVER
# End MODULE server_smb
################################################
@@ -27,7 +27,7 @@ REQUIRED_SUBSYSTEMS = \
INIT_FUNCTION = server_service_rpc_init
SUBSYSTEM = service
OUTPUT_TYPE = MERGEDOBJ
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
dcerpc_server
# End MODULE server_rpc
################################################
@@ -37,7 +37,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_ldap]
INIT_FUNCTION = server_service_ldap_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LDAP
# End MODULE server_ldap
################################################
@@ -47,7 +47,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_nbtd]
INIT_FUNCTION = server_service_nbtd_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
NBTD
# End MODULE service_nbtd
################################################
@@ -57,7 +57,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_wrepl]
INIT_FUNCTION = server_service_wrepl_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
WREPL_SRV
# End MODULE service_wrepl
################################################
@@ -67,7 +67,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_cldap]
INIT_FUNCTION = server_service_cldapd_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
CLDAPD
# End MODULE service_cldapd
################################################
@@ -77,7 +77,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_web]
INIT_FUNCTION = server_service_web_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
WEB
# End MODULE service_web
################################################
@@ -87,7 +87,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_kdc]
INIT_FUNCTION = server_service_kdc_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
KDC
# End MODULE service_web
################################################
@@ -97,7 +97,7 @@ REQUIRED_SUBSYSTEMS = \
[MODULE::service_winbind]
INIT_FUNCTION = server_service_winbind_init
SUBSYSTEM = service
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
WINBIND
# End MODULE service_winbind
################################################
@@ -110,7 +110,7 @@ OBJ_FILES = \
service.o \
service_stream.o \
service_task.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
MESSAGING
# End SUBSYSTEM SERVER
#######################
@@ -122,7 +122,7 @@ INSTALLDIR = SBINDIR
MANPAGE = smbd.8
OBJ_FILES = \
server.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
process_model \
service \
LIBSAMBA-CONFIG \
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 0d29e20c0f..cf6b02dccc 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -17,7 +17,7 @@ INIT_FUNCTION = process_model_standard_init
SUBSYSTEM = process_model
OBJ_FILES = \
process_standard.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_SETPROCTITLE
+PUBLIC_DEPENDENCIES = EXT_LIB_SETPROCTITLE
# End MODULE process_model_standard
################################################
@@ -28,7 +28,7 @@ INIT_FUNCTION = process_model_thread_init
SUBSYSTEM = process_model
OBJ_FILES = \
process_thread.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
+PUBLIC_DEPENDENCIES = EXT_LIB_PTHREAD
# End MODULE process_model_thread
################################################
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index fd93f92758..bf5b6ef2fb 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -8,7 +8,7 @@ PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \
torture.o \
ui.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
TORTURE_UTIL \
TORTURE_RAW \
TORTURE_SMB2 \
@@ -50,7 +50,7 @@ OBJ_FILES = \
basic/delaywrite.o \
basic/attr.o \
basic/properties.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB
# End SUBSYSTEM TORTURE_BASIC
#################################
@@ -84,7 +84,7 @@ OBJ_FILES = \
raw/acls.o \
raw/seek.o \
raw/composite.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_LSA
# End SUBSYSTEM TORTURE_RAW
#################################
@@ -98,7 +98,7 @@ PRIVATE_PROTO_HEADER = \
com/proto.h
OBJ_FILES = \
com/simple.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
com dcom
[MODULE::torture_rpc]
@@ -147,7 +147,7 @@ OBJ_FILES = \
rpc/alter_context.o \
rpc/bench.o \
rpc/rpc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
@@ -162,7 +162,7 @@ PRIVATE_PROTO_HEADER = \
rap/proto.h
OBJ_FILES = \
rap/rap.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB
# End SUBSYSTEM TORTURE_RAP
#################################
@@ -175,7 +175,7 @@ PRIVATE_PROTO_HEADER = \
OBJ_FILES = \
auth/ntlmssp.o \
auth/pac.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB gensec auth
# End SUBSYSTEM TORTURE_AUTH
#################################
@@ -203,7 +203,7 @@ OBJ_FILES = \
ldap/basic.o \
ldap/cldap.o \
ldap/cldapbench.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_LDAP LIBCLI_CLDAP
# End SUBSYSTEM TORTURE_LDAP
#################################
@@ -221,7 +221,7 @@ OBJ_FILES = \
nbt/winsreplication.o \
nbt/dgram.o \
nbt/browse.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSMB LIBCLI_NBT LIBCLI_WREPL
# End SUBSYSTEM TORTURE_NBT
#################################
@@ -242,7 +242,7 @@ OBJ_FILES = \
libnet/libnet_user.o \
libnet/libnet_share.o \
libnet/libnet_rpc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBSAMBA-NET
# End SUBSYSTEM TORTURE_NET
#################################
@@ -253,7 +253,7 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES = \
smbtorture.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
torture \
LIBPOPT \
POPT_SAMBA \
@@ -268,7 +268,7 @@ MANPAGE = man/smbtorture.1
INSTALLDIR = BINDIR
OBJ_FILES = \
gentest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
@@ -285,7 +285,7 @@ MANPAGE = man/gentest.1
INSTALLDIR = BINDIR
OBJ_FILES = \
masktest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
@@ -302,7 +302,7 @@ MANPAGE = man/masktest.1
INSTALLDIR = BINDIR
OBJ_FILES = \
locktest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSMB \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 40f0e97359..3689f9bf60 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -17,7 +17,7 @@ OBJ_FILES = \
util_file.o \
sddl.o \
ndr.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \
LIBSMB \
MESSAGING \
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index 8c95208151..0a4c1ecc82 100644
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
getinfo.o \
setinfo.o \
find.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_SMB2
# End SUBSYSTEM TORTURE_SMB2
#################################
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index a7ca518095..7e235f9eb3 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -6,7 +6,7 @@
INSTALLDIR = BINDIR
OBJ_FILES = \
ndrdump.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
@@ -23,7 +23,7 @@ MANPAGE = man/ndrdump.1
INSTALLDIR = BINDIR
OBJ_FILES = \
ntlm_auth.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
@@ -40,7 +40,7 @@ MANPAGE = man/getntacl.1
INSTALLDIR = BINDIR
OBJ_FILES = \
getntacl.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
NDR_XATTR \
@@ -55,7 +55,6 @@ REQUIRED_SUBSYSTEMS = \
#INSTALLDIR = BINDIR
OBJ_FILES = \
setntacl.o
-REQUIRED_SUBSYSTEMS =
# End BINARY setntacl
#################################
@@ -65,7 +64,7 @@ REQUIRED_SUBSYSTEMS =
INSTALLDIR = BINDIR
OBJ_FILES = \
setnttoken.o
-REQUIRED_SUBSYSTEMS =
+PRIVATE_DEPENDENCIES =
# End BINARY setnttoken
#################################
@@ -75,7 +74,7 @@ REQUIRED_SUBSYSTEMS =
INSTALLDIR = BINDIR
OBJ_FILES = \
nmblookup.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBCLI_NBT \
@@ -91,7 +90,7 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES = \
testparm.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index 19632b25ef..c07d6a67cb 100644
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -12,7 +12,7 @@ OBJ_FILES = \
net_join.o \
net_vampire.o \
net_user.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBSAMBA-NET \
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index 5cd058a774..a4fe7f8886 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -7,6 +7,6 @@ PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = \
web_server.o \
http.o
-REQUIRED_SUBSYSTEMS = ESP LIBTLS smbcalls process_model
+PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model
# End SUBSYSTEM WEB
#######################
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index b28d8a8ec1..cac46c1dfa 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -21,7 +21,7 @@ OBJ_FILES = \
wb_cmd_usersids.o \
wb_cmd_list_trustdom.o \
wb_pam_auth.o
-REQUIRED_SUBSYSTEMS = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
+PUBLIC_DEPENDENCIES = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
PAM_ERRORS
# End SUBSYSTEM WINBIND
#######################
@@ -32,6 +32,6 @@ REQUIRED_SUBSYSTEMS = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \
PRIVATE_PROTO_HEADER = wb_helper.h
OBJ_FILES = \
wb_async_helpers.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_LSA RPC_NDR_SAMR
+PUBLIC_DEPENDENCIES = RPC_NDR_LSA RPC_NDR_SAMR
# End SUBSYSTEM WB_HELPER
################################################
diff --git a/source4/wrepl_server/config.mk b/source4/wrepl_server/config.mk
index 830b489086..5305f986b6 100644
--- a/source4/wrepl_server/config.mk
+++ b/source4/wrepl_server/config.mk
@@ -14,7 +14,7 @@ OBJ_FILES = \
wrepl_out_push.o \
wrepl_out_helpers.o
PRIVATE_PROTO_HEADER = wrepl_server_proto.h
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
LIBCLI_WREPL WINSDB process_model
# End SUBSYSTEM WREPL_SRV
#######################