new build patch
Peter Novodvorsky
nidd at myxomop.com
Wed Aug 24 13:54:17 GMT 2005
Please, look at my patch that adds support for buildling smbd and
other binaries to be broken into libraries (dynamic) and small binaries.
-------------- next part --------------
Index: source/config.list
===================================================================
--- source/config.list (revision 8528)
+++ source/config.list (working copy)
@@ -1,4 +1,7 @@
# master list of build config files for Samba4
+libraries.mk
+binaries.mk
+modules.mk
heimdal_build/config.mk
dsdb/config.mk
gtk/config.mk
Index: source/gtk/config.mk
===================================================================
--- source/gtk/config.mk (revision 8528)
+++ source/gtk/config.mk (working copy)
@@ -14,7 +14,7 @@
################################################
# Start BINARY gregedit
-[BINARY::gregedit]
+[SUBSYSTEM::bin_gregedit]
OBJ_FILES = gtk/tools/gregedit.o
REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE REGISTRY GTKSMB
MANPAGE = gtk/man/gregedit.1
@@ -23,7 +23,7 @@
################################################
# Start BINARY gepdump
-[BINARY::gepdump]
+[SUBSYSTEM::bin_gepdump]
OBJ_FILES = gtk/tools/gepdump.o
REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
# End BINARY gepdump
@@ -31,7 +31,7 @@
################################################
# Start BINARY gwcrontab
-[BINARY::gwcrontab]
+[SUBSYSTEM::bin_gwcrontab]
OBJ_FILES = gtk/tools/gwcrontab.o
REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_ATSVC
# End BINARY gwcrontab
@@ -39,7 +39,7 @@
################################################
# Start BINARY gwsam
-[BINARY::gwsam]
+[SUBSYSTEM::bin_gwsam]
OBJ_FILES = gtk/tools/gwsam.o gtk/tools/gwsam_user.o
REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE RPC_NDR_SAMR GTKSMB
# End BINARY gwsam
Index: source/smbd/process_model.mk
===================================================================
--- source/smbd/process_model.mk (revision 8528)
+++ source/smbd/process_model.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE process_model_single
-[MODULE::process_model_single]
+[SUBSYSTEM::process_model_single]
INIT_FUNCTION = process_model_single_init
SUBSYSTEM = PROCESS_MODEL
INIT_OBJ_FILES = \
@@ -12,7 +12,7 @@
################################################
# Start MODULE process_model_standard
-[MODULE::process_model_standard]
+[SUBSYSTEM::process_model_standard]
INIT_FUNCTION = process_model_standard_init
SUBSYSTEM = PROCESS_MODEL
INIT_OBJ_FILES = \
@@ -22,7 +22,7 @@
################################################
# Start MODULE process_model_thread
-[MODULE::process_model_thread]
+[SUBSYSTEM::process_model_thread]
INIT_FUNCTION = process_model_thread_init
SUBSYSTEM = PROCESS_MODEL
INIT_OBJ_FILES = \
Index: source/smbd/config.mk
===================================================================
--- source/smbd/config.mk (revision 8528)
+++ source/smbd/config.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE server_service_auth
-[MODULE::server_service_auth]
+[SUBSYSTEM::server_service_auth]
INIT_FUNCTION = server_service_auth_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -12,7 +12,7 @@
################################################
# Start MODULE server_service_smb
-[MODULE::server_service_smb]
+[SUBSYSTEM::server_service_smb]
INIT_FUNCTION = server_service_smb_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -22,7 +22,7 @@
################################################
# Start MODULE server_service_rpc
-[MODULE::server_service_rpc]
+[SUBSYSTEM::server_service_rpc]
INIT_FUNCTION = server_service_rpc_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -32,7 +32,7 @@
################################################
# Start MODULE server_service_ldap
-[MODULE::server_service_ldap]
+[SUBSYSTEM::server_service_ldap]
INIT_FUNCTION = server_service_ldap_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -42,7 +42,7 @@
################################################
# Start MODULE server_service_nbtd
-[MODULE::server_service_nbtd]
+[SUBSYSTEM::server_service_nbtd]
INIT_FUNCTION = server_service_nbtd_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -52,7 +52,7 @@
################################################
# Start MODULE server_service_cldapd
-[MODULE::server_service_cldap]
+[SUBSYSTEM::server_service_cldap]
INIT_FUNCTION = server_service_cldapd_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -62,7 +62,7 @@
################################################
# Start MODULE server_service_web
-[MODULE::server_service_web]
+[SUBSYSTEM::server_service_web]
INIT_FUNCTION = server_service_web_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -72,7 +72,7 @@
################################################
# Start MODULE server_service_web
-[MODULE::server_service_kdc]
+[SUBSYSTEM::server_service_kdc]
INIT_FUNCTION = server_service_kdc_init
SUBSYSTEM = SERVER_SERVICE
REQUIRED_SUBSYSTEMS = \
@@ -94,7 +94,7 @@
#################################
# Start BINARY smbd
-[BINARY::smbd]
+[SUBSYSTEM::bin_smbd]
OBJ_FILES = \
smbd/server.o
REQUIRED_SUBSYSTEMS = \
Index: source/winbind/config.mk
===================================================================
--- source/winbind/config.mk (revision 8528)
+++ source/winbind/config.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE server_service_auth
-[MODULE::server_service_winbind]
+[SUBSYSTEM::server_service_winbind]
INIT_FUNCTION = server_service_winbind_init
SUBSYSTEM = SERVER_SERVICE
INIT_OBJ_FILES = \
Index: source/auth/ntlmssp/config.mk
===================================================================
--- source/auth/ntlmssp/config.mk (revision 8528)
+++ source/auth/ntlmssp/config.mk (working copy)
@@ -1,6 +1,6 @@
################################################
# Start MODULE gensec_ntlmssp
-[MODULE::gensec_ntlmssp]
+[SUBSYSTEM::gensec_ntlmssp]
SUBSYSTEM = GENSEC
INIT_FUNCTION = gensec_ntlmssp_init
INIT_OBJ_FILES = auth/ntlmssp/ntlmssp.o
Index: source/auth/gensec/config.mk
===================================================================
--- source/auth/gensec/config.mk (revision 8528)
+++ source/auth/gensec/config.mk (working copy)
@@ -10,7 +10,7 @@
################################################
# Start MODULE gensec_krb5
-[MODULE::gensec_krb5]
+[SUBSYSTEM::gensec_krb5]
SUBSYSTEM = GENSEC
INIT_FUNCTION = gensec_krb5_init
INIT_OBJ_FILES = auth/gensec/gensec_krb5.o
@@ -20,7 +20,7 @@
################################################
# Start MODULE gensec_gssapi
-[MODULE::gensec_gssapi]
+[SUBSYSTEM::gensec_gssapi]
SUBSYSTEM = GENSEC
INIT_FUNCTION = gensec_gssapi_init
INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o
@@ -30,7 +30,7 @@
################################################
# Start MODULE gensec_spnego
-[MODULE::gensec_spnego]
+[SUBSYSTEM::gensec_spnego]
SUBSYSTEM = GENSEC
INIT_FUNCTION = gensec_spnego_init
INIT_OBJ_FILES = auth/gensec/spnego.o
@@ -41,7 +41,7 @@
################################################
# Start MODULE gensec_schannel
-[MODULE::gensec_schannel]
+[SUBSYSTEM::gensec_schannel]
SUBSYSTEM = GENSEC
INIT_FUNCTION = gensec_schannel_init
INIT_OBJ_FILES = auth/gensec/schannel.o
Index: source/auth/config.mk
===================================================================
--- source/auth/config.mk (revision 8528)
+++ source/auth/config.mk (working copy)
@@ -2,7 +2,7 @@
#######################
# Start MODULE auth_sam
-[MODULE::auth_sam]
+[SUBSYSTEM::auth_sam]
INIT_FUNCTION = auth_sam_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
@@ -14,7 +14,7 @@
#######################
# Start MODULE auth_anonymous
-[MODULE::auth_anonymous]
+[SUBSYSTEM::auth_anonymous]
INIT_FUNCTION = auth_anonymous_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
@@ -24,7 +24,7 @@
#######################
# Start MODULE auth_winbind
-[MODULE::auth_winbind]
+[SUBSYSTEM::auth_winbind]
INIT_FUNCTION = auth_winbind_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
@@ -37,7 +37,7 @@
#######################
# Start MODULE auth_domain
-[MODULE::auth_domain]
+[SUBSYSTEM::auth_domain]
INIT_FUNCTION = auth_domain_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
@@ -49,7 +49,7 @@
#######################
# Start MODULE auth_developer
-[MODULE::auth_developer]
+[SUBSYSTEM::auth_developer]
INIT_FUNCTION = auth_developer_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
@@ -59,7 +59,7 @@
#######################
# Start MODULE auth_developer
-[MODULE::auth_unix]
+[SUBSYSTEM::auth_unix]
INIT_FUNCTION = auth_unix_init
SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
Index: source/scripting/ejs/config.mk
===================================================================
--- source/scripting/ejs/config.mk (revision 8528)
+++ source/scripting/ejs/config.mk (working copy)
@@ -31,7 +31,7 @@
#######################
# Start BINARY SMBSCRIPT
-[BINARY::smbscript]
+[SUBSYSTEM::bin_smbscript]
OBJ_FILES = \
scripting/ejs/smbscript.o
REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
Index: source/lib/com/config.mk
===================================================================
--- source/lib/com/config.mk (revision 8528)
+++ source/lib/com/config.mk (working copy)
@@ -11,7 +11,7 @@
REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
RPC_NDR_OXIDRESOLVER
-[MODULE::com_simple]
+[SUBSYSTEM::com_simple]
SUBSYSTEM = COM
INIT_OBJ_FILES = lib/com/classes/simple.o
INIT_FUNCTION = com_simple_init
Index: source/lib/talloc/config.mk
===================================================================
--- source/lib/talloc/config.mk (revision 8528)
+++ source/lib/talloc/config.mk (working copy)
@@ -13,12 +13,12 @@
################################################
# Start LIBRARY LIBTALLOC
-[LIBRARY::libtalloc]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
- LIBTALLOC
+# [LIBRARY::libtalloc]
+# MAJOR_VERSION = 0
+# MINOR_VERSION = 0
+# RELEASE_VERSION = 1
+# INCLUDES = LIBTALLOC
+
#
# End LIBRARY LIBTALLOC
################################################
Index: source/lib/ldb/config.mk
===================================================================
--- source/lib/ldb/config.mk (revision 8528)
+++ source/lib/ldb/config.mk (working copy)
@@ -1,6 +1,6 @@
################################################
# Start MODULE libldb_timestamps
-[MODULE::libldb_timestamps]
+[SUBSYSTEM::libldb_timestamps]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/modules/timestamps.o
@@ -9,7 +9,7 @@
################################################
# Start MODULE libldb_schema
-[MODULE::libldb_schema]
+[SUBSYSTEM::libldb_schema]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/modules/schema.o
@@ -18,7 +18,7 @@
################################################
# Start MODULE libldb_ildap
-[MODULE::libldb_ildap]
+[SUBSYSTEM::libldb_ildap]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/ldb_ildap/ldb_ildap.o
@@ -30,7 +30,7 @@
################################################
# Start MODULE libldb_sqlite3
-[MODULE::libldb_sqlite3]
+[SUBSYSTEM::libldb_sqlite3]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/ldb_sqlite3/ldb_sqlite3.o
@@ -42,7 +42,7 @@
################################################
# Start MODULE libldb_tdb
-[MODULE::libldb_tdb]
+[SUBSYSTEM::libldb_tdb]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/ldb_tdb/ldb_tdb.o
@@ -112,7 +112,7 @@
################################################
# Start BINARY ldbadd
-[BINARY::ldbadd]
+[SUBSYSTEM::bin_ldbadd]
OBJ_FILES = \
lib/ldb/tools/ldbadd.o
REQUIRED_SUBSYSTEMS = \
@@ -123,7 +123,7 @@
################################################
# Start BINARY ldbdel
-[BINARY::ldbdel]
+[SUBSYSTEM::bin_ldbdel]
OBJ_FILES= \
lib/ldb/tools/ldbdel.o
REQUIRED_SUBSYSTEMS = \
@@ -134,7 +134,7 @@
################################################
# Start BINARY ldbmodify
-[BINARY::ldbmodify]
+[SUBSYSTEM::bin_ldbmodify]
OBJ_FILES= \
lib/ldb/tools/ldbmodify.o
REQUIRED_SUBSYSTEMS = \
@@ -145,7 +145,7 @@
################################################
# Start BINARY ldbsearch
-[BINARY::ldbsearch]
+[SUBSYSTEM::bin_ldbsearch]
OBJ_FILES= \
lib/ldb/tools/ldbsearch.o
REQUIRED_SUBSYSTEMS = \
@@ -156,7 +156,7 @@
################################################
# Start BINARY ldbedit
-[BINARY::ldbedit]
+[SUBSYSTEM::bin_ldbedit]
OBJ_FILES= \
lib/ldb/tools/ldbedit.o
REQUIRED_SUBSYSTEMS = \
@@ -167,7 +167,7 @@
################################################
# Start BINARY ldbrename
-[BINARY::ldbrename]
+[SUBSYSTEM::bin_ldbrename]
OBJ_FILES= \
lib/ldb/tools/ldbrename.o
REQUIRED_SUBSYSTEMS = \
@@ -178,7 +178,7 @@
################################################
# Start BINARY ldbtest
-[BINARY::ldbtest]
+[SUBSYSTEM::bin_ldbtest]
OBJ_FILES= \
lib/ldb/tools/ldbtest.o
REQUIRED_SUBSYSTEMS = \
Index: source/lib/registry/config.mk
===================================================================
--- source/lib/registry/config.mk (revision 8528)
+++ source/lib/registry/config.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE registry_nt4
-[MODULE::registry_nt4]
+[SUBSYSTEM::registry_nt4]
INIT_FUNCTION = registry_nt4_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -12,7 +12,7 @@
################################################
# Start MODULE registry_w95
-[MODULE::registry_w95]
+[SUBSYSTEM::registry_w95]
INIT_FUNCTION = registry_w95_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -22,7 +22,7 @@
################################################
# Start MODULE registry_dir
-[MODULE::registry_dir]
+[SUBSYSTEM::registry_dir]
INIT_FUNCTION = registry_dir_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -32,7 +32,7 @@
################################################
# Start MODULE registry_rpc
-[MODULE::registry_rpc]
+[SUBSYSTEM::registry_rpc]
INIT_FUNCTION = registry_rpc_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -45,7 +45,7 @@
################################################
# Start MODULE registry_gconf
-[MODULE::registry_gconf]
+[SUBSYSTEM::registry_gconf]
INIT_FUNCTION = registry_gconf_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -56,7 +56,7 @@
################################################
# Start MODULE registry_ldb
-[MODULE::registry_ldb]
+[SUBSYSTEM::registry_ldb]
INIT_FUNCTION = registry_ldb_init
SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
@@ -93,7 +93,7 @@
################################################
# Start BINARY regdiff
-[BINARY::regdiff]
+[SUBSYSTEM::bin_regdiff]
OBJ_FILES= \
lib/registry/tools/regdiff.o
REQUIRED_SUBSYSTEMS = \
@@ -104,7 +104,7 @@
################################################
# Start BINARY regpatch
-[BINARY::regpatch]
+[SUBSYSTEM::bin_regpatch]
OBJ_FILES= \
lib/registry/tools/regpatch.o
REQUIRED_SUBSYSTEMS = \
@@ -115,7 +115,7 @@
################################################
# Start BINARY regshell
-[BINARY::regshell]
+[SUBSYSTEM::bin_regshell]
OBJ_FILES= \
lib/registry/tools/regshell.o
REQUIRED_SUBSYSTEMS = \
@@ -126,7 +126,7 @@
################################################
# Start BINARY regtree
-[BINARY::regtree]
+[SUBSYSTEM::bin_regtree]
OBJ_FILES= \
lib/registry/tools/regtree.o
REQUIRED_SUBSYSTEMS = \
Index: source/lib/tdb/config.mk
===================================================================
--- source/lib/tdb/config.mk (revision 8528)
+++ source/lib/tdb/config.mk (working copy)
@@ -27,7 +27,7 @@
################################################
# Start BINARY tdbtool
-[BINARY::tdbtool]
+[SUBSYSTEM::bin_tdbtool]
ENABLE = NO
OBJ_FILES= \
lib/tdb/tools/tdbtool.o
@@ -38,7 +38,7 @@
################################################
# Start BINARY tdbtorture
-[BINARY::tdbtorture]
+[SUBSYSTEM::bin_tdbtorture]
OBJ_FILES= \
lib/tdb/tools/tdbtorture.o
REQUIRED_SUBSYSTEMS = \
@@ -48,7 +48,7 @@
################################################
# Start BINARY tdbdump
-[BINARY::tdbdump]
+[SUBSYSTEM::bin_tdbdump]
OBJ_FILES= \
lib/tdb/tools/tdbdump.o
REQUIRED_SUBSYSTEMS = \
@@ -58,7 +58,7 @@
################################################
# Start BINARY tdbbackup
-[BINARY::tdbbackup]
+[SUBSYSTEM::bin_tdbbackup]
ENABLE = NO
OBJ_FILES= \
lib/tdb/tools/tdbbackup.o
Index: source/rpc_server/config.mk
===================================================================
--- source/rpc_server/config.mk (revision 8528)
+++ source/rpc_server/config.mk (working copy)
@@ -12,7 +12,7 @@
################################################
# Start MODULE dcerpc_dcom
-[MODULE::dcerpc_dcom]
+[SUBSYSTEM::dcerpc_dcom]
ENABLE = NO
INIT_FUNCTION = dcerpc_server_dcom_init
SUBSYSTEM = DCERPC
@@ -30,7 +30,7 @@
################################################
# Start MODULE dcerpc_rpcecho
-[MODULE::dcerpc_rpcecho]
+[SUBSYSTEM::dcerpc_rpcecho]
INIT_FUNCTION = dcerpc_server_rpcecho_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -41,7 +41,7 @@
################################################
# Start MODULE dcerpc_epmapper
-[MODULE::dcerpc_epmapper]
+[SUBSYSTEM::dcerpc_epmapper]
INIT_FUNCTION = dcerpc_server_epmapper_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -52,7 +52,7 @@
################################################
# Start MODULE dcerpc_remote
-[MODULE::dcerpc_remote]
+[SUBSYSTEM::dcerpc_remote]
INIT_FUNCTION = dcerpc_server_remote_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -64,7 +64,7 @@
################################################
# Start MODULE dcerpc_srvsvc
-[MODULE::dcerpc_srvsvc]
+[SUBSYSTEM::dcerpc_srvsvc]
INIT_FUNCTION = dcerpc_server_srvsvc_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -76,7 +76,7 @@
################################################
# Start MODULE dcerpc_wkssvc
-[MODULE::dcerpc_wkssvc]
+[SUBSYSTEM::dcerpc_wkssvc]
INIT_FUNCTION = dcerpc_server_wkssvc_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -88,7 +88,7 @@
################################################
# Start MODULE dcerpc_unixinfo
-[MODULE::dcerpc_unixinfo]
+[SUBSYSTEM::dcerpc_unixinfo]
INIT_FUNCTION = dcerpc_server_unixinfo_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -101,7 +101,7 @@
################################################
# Start MODULE dcerpc_samr
-[MODULE::dcerpc_samr]
+[SUBSYSTEM::dcerpc_samr]
INIT_FUNCTION = dcerpc_server_samr_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -117,7 +117,7 @@
################################################
# Start MODULE dcerpc_winreg
-[MODULE::dcerpc_winreg]
+[SUBSYSTEM::dcerpc_winreg]
INIT_FUNCTION = dcerpc_server_winreg_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -129,7 +129,7 @@
################################################
# Start MODULE dcerpc_netlogon
-[MODULE::dcerpc_netlogon]
+[SUBSYSTEM::dcerpc_netlogon]
INIT_FUNCTION = dcerpc_server_netlogon_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -143,7 +143,7 @@
################################################
# Start MODULE dcerpc_lsa
-[MODULE::dcerpc_lsarpc]
+[SUBSYSTEM::dcerpc_lsarpc]
INIT_FUNCTION = dcerpc_server_lsarpc_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -157,7 +157,7 @@
################################################
# Start MODULE dcerpc_spoolss
-[MODULE::dcerpc_spoolss]
+[SUBSYSTEM::dcerpc_spoolss]
INIT_FUNCTION = dcerpc_server_spoolss_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -171,7 +171,7 @@
################################################
# Start MODULE dcerpc_drsuapi
-[MODULE::dcerpc_drsuapi]
+[SUBSYSTEM::dcerpc_drsuapi]
INIT_FUNCTION = dcerpc_server_drsuapi_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
@@ -187,7 +187,7 @@
################################################
# Start MODULE dcerpc_dssetup
-[MODULE::dcerpc_dssetup]
+[SUBSYSTEM::dcerpc_dssetup]
INIT_FUNCTION = dcerpc_server_dssetup_init
SUBSYSTEM = DCERPC
INIT_OBJ_FILES = \
Index: source/dsdb/config.mk
===================================================================
--- source/dsdb/config.mk (revision 8528)
+++ source/dsdb/config.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE libldb_samldb
-[MODULE::libldb_samldb]
+[SUBSYSTEM::libldb_samldb]
SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
dsdb/samdb/ldb_modules/samldb.o
Index: source/heimdal_build/config.mk
===================================================================
--- source/heimdal_build/config.mk (revision 8528)
+++ source/heimdal_build/config.mk (working copy)
@@ -349,7 +349,7 @@
#######################
# Start BINARY asn1_compile
-[BINARY::asn1_compile]
+[SUBSYSTEM::bin_asn1_compile]
REQUIRED_SUBSYSTEMS = ASN1_COMPILER LIBREPLACE
# End BINARY asn1_compile
#######################
@@ -375,7 +375,7 @@
#######################
# Start BINARY compile_et
-[BINARY::compile_et]
+[SUBSYSTEM::bin_compile_et]
REQUIRED_SUBSYSTEMS = COMPILE_ET LIBREPLACE
# End BINARY compile_et
#######################
Index: source/build/smb_build/dot.pm
===================================================================
--- source/build/smb_build/dot.pm (revision 8528)
+++ source/build/smb_build/dot.pm (working copy)
@@ -21,3 +21,5 @@
}
1;
+
+
Index: source/build/smb_build/config_mk.pm
===================================================================
--- source/build/smb_build/config_mk.pm (revision 8528)
+++ source/build/smb_build/config_mk.pm (working copy)
@@ -18,6 +18,7 @@
"INIT_OBJ_FILES" => "list",
"ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
+ "INCLUDES" => "list",
"SUBSYSTEM" => "string",
"INIT_FUNCTION" => "string",
"MAJOR_VERSION" => "string",
Index: source/build/smb_build/input.pm
===================================================================
--- source/build/smb_build/input.pm (revision 8528)
+++ source/build/smb_build/input.pm (working copy)
@@ -45,104 +45,6 @@
return @ar;
}
-sub check_subsystem($$)
-{
- my $INPUT = shift;
- my $subsys = shift;
- if ($subsys->{ENABLE} ne "YES") {
- printf("Subsystem: %s disabled!\n",$subsys->{NAME});
- return;
- }
-
- unless(defined($subsys->{OUTPUT_TYPE})) {
- $subsys->{OUTPUT_TYPE} = $subsystem_default_output_type;
- }
-}
-
-sub check_module($$)
-{
- my $INPUT = shift;
- my $mod = shift;
-
- die("Module $mod->{NAME} does not have a SUBSYSTEM set") if not defined($mod->{SUBSYSTEM});
-
- ($mod->{DEFAULT_BUILD} = "STATIC") if not defined($mod->{DEFAULT_BUILD});
-
- my $use_default = 0;
-
- if (!(defined($INPUT->{$mod->{SUBSYSTEM}}))) {
- $mod->{BUILD} = "NOT";
- $mod->{ENABLE} = "NO";
- printf("Module: %s...PARENT SUBSYSTEM ($mod->{SUBSYSTEM}) DISABLED\n",$mod->{NAME});
- return;
- }
-
- if ($mod->{ENABLE} ne "YES")
- {
- $mod->{CHOSEN_BUILD} = "NOT";
- }
-
- if (not defined($mod->{CHOSEN_BUILD}) or $mod->{CHOSEN_BUILD} eq "DEFAULT") {
- $mod->{CHOSEN_BUILD} = $mod->{DEFAULT_BUILD};
- }
-
- if ($mod->{CHOSEN_BUILD} eq "SHARED") {
- $mod->{ENABLE} = "YES";
- $mod->{OUTPUT_TYPE} = "SHARED_LIBRARY";
- push (@{$mod->{REQUIRED_SUBSYSTEMS}}, $mod->{SUBSYSTEM});
- printf("Module: %s...shared\n",$mod->{NAME});
- } elsif ($mod->{CHOSEN_BUILD} eq "STATIC") {
- $mod->{ENABLE} = "YES";
- push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
- printf("Module: %s...static\n",$mod->{NAME});
- $mod->{OUTPUT_TYPE} = $subsystem_default_output_type;
- } else {
- $mod->{ENABLE} = "NO";
- printf("Module: %s...not\n",$mod->{NAME});
- return;
- }
-}
-
-sub check_library($$)
-{
- my $INPUT = shift;
- my $lib = shift;
-
- if ($lib->{ENABLE} ne "YES") {
- printf("Library: %s...disabled\n",$lib->{NAME});
- return;
- }
-
- $lib->{OUTPUT_TYPE} = "SHARED_LIBRARY";
-}
-
-sub check_target($$)
-{
- my $INPUT = shift;
- my $bin = shift;
-
- if (!defined($bin->{CMD})) {
- print "CMD not defined for target!\n";
- }
-
- $bin->{OUTPUT_TYPE} = "CUSTOM";
-}
-
-sub check_binary($$)
-{
- my $INPUT = shift;
- my $bin = shift;
-
- if ($bin->{ENABLE} ne "YES") {
- printf("Binary: %s...disabled\n",$bin->{NAME});
- return;
- }
-
- ($bin->{BINARY} = (lc $bin->{NAME})) if not defined($bin->{BINARY});
-
- $bin->{OUTPUT_TYPE} = "BINARY";
-}
-
sub calc_unique_deps
{
my $deps = shift;
@@ -168,6 +70,9 @@
sub check($)
{
my $INPUT = shift;
+ my %subsystems;
+ my %buildvars;
+ my %components;
($subsystem_default_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}) if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"}));
@@ -181,12 +86,6 @@
print STDERR "$k does not have a type set.. Perhaps it's only mentioned in a .m4 but not in a .mk file?\n";
next;
}
- check_subsystem($INPUT, $part) if ($part->{TYPE} eq "SUBSYSTEM");
- check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
- check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");
- check_binary($INPUT, $part) if ($part->{TYPE} eq "BINARY");
- check_target($INPUT, $part) if ($part->{TYPE} eq "TARGET");
-
#FIXME: REQUIRED_LIBRARIES needs to go
if (defined($part->{REQUIRED_LIBRARIES})) {
push(@{$part->{REQUIRED_SUBSYSTEMS}}, @{$part->{REQUIRED_LIBRARIES}});
@@ -197,7 +96,41 @@
my %depend = %$INPUT;
foreach my $part (values %depend) {
+
+ # Generate list of dependencies
+ $part->{DEPENDENCIES} = [];
+
+ if ($part->{TYPE} eq "SUBSYSTEM") {
+ foreach my $key (@{$part->{REQUIRED_SUBSYSTEMS}}) {
+ die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
+ push (@{$part->{DEPENDENCIES}}, \$depend{$key});
+ }
+ delete ($part->{REQUIRED_SUBSYSTEMS});
+ } elsif (($part->{TYPE} eq "LIBRARY") or ($part->{TYPE} eq "MODULE") or ($part->{TYPE} eq "BINARY")) {
+ foreach my $key (@{$part->{INCLUDES}}) {
+ die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
+ push (@{$part->{DEPENDENCIES}}, \$depend{$key});
+ if (defined ($depend{$key}{INCLUDED_IN})) {
+ print "WARNING: $key is already included in $depend{$key}{INCLUDED_IN}, however $part->{NAME} wants to include it\n";
+ }
+ $depend{$key}{INCLUDED_IN} = $part->{NAME};
+ }
+ }
+ }
+
+ foreach my $part (values %depend) {
+ $part->{DEPENDENCIES} = [];
+
+ if ($part->{TYPE} eq "SUBSYSTEM") {
+ if (not defined $part->{INCLUDED_IN}) {
+ print "$part->{NAME} ";
+ }
+ }
+ }
+
+ foreach my $part (values %depend) {
+
# Generate list of dependencies
$part->{DEPENDENCIES} = [];
@@ -214,7 +147,8 @@
calc_unique_deps($part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
}
- return \%depend;
+
+ return (\%subsystems, \%buildvars, \%components);
}
1;
Index: source/build/smb_build/output.pm
===================================================================
--- source/build/smb_build/output.pm (revision 8528)
+++ source/build/smb_build/output.pm (working copy)
@@ -18,17 +18,18 @@
$subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJS)";
}
-sub generate_shared_library($)
+sub generate_shared_library($$$$)
{
- my $lib = shift;
+ my $subsystems = shift;
+ my $buildvars = shift;
+ my $components = shift;
+ my $lib = shift
- @{$lib->{DEPEND_LIST}} = ();
- @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)");
- $lib->{LIBRARY_NAME} = lc($lib->{NAME}).".so";
+ $lib->{LIBRARY_NAME} = lc($components{$lib->{COMPONENT}}->{NAME}).".so";
$lib->{TARGET} = "bin/lib$lib->{LIBRARY_NAME}";
- if (defined($lib->{MAJOR_VERSION})) {
- $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}";
- $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$lib->{MINOR_VERSION}.$lib->{RELEASE_VERSION}";
+ if (defined($components{$lib->{COMPONENT}}->{MAJOR_VERSION})) {
+ $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$components{$lib->{COMPONENT}}->{MAJOR_VERSION}";
+ $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$components{$lib->{COMPONENT}}->{MINOR_VERSION}.$components{$lib->{COMPONENT}}->{RELEASE_VERSION}";
$lib->{TARGET} = "bin/lib$lib->{LIBRARY_REALNAME}";
@{$lib->{LINK_FLAGS}} = ("\@SONAMEFLAG\@$lib->{LIBRARY_SONAME}");
}
@@ -37,12 +38,14 @@
sub generate_static_library($)
{
+ my $subsystems = shift;
+ my $buildvars = shift;
+ my $components = shift;
my $lib = shift;
@{$lib->{DEPEND_LIST}} = ();
- $lib->{LIBRARY_NAME} = lc($lib->{NAME}).".a";
- @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)");
+ $lib->{LIBRARY_NAME} = lc($components{$lib->{COMPONENT}}->{NAME}).".a";
@{$lib->{LINK_FLAGS}} = ();
$lib->{TARGET} = "bin/lib$lib->{LIBRARY_NAME}";
@@ -51,84 +54,81 @@
sub generate_binary($)
{
+ my $subsystems = shift;
+ my $buildvars = shift;
+ my $components = shift;
my $bin = shift;
@{$bin->{DEPEND_LIST}} = ();
- @{$bin->{LINK_LIST}} = ("\$($bin->{TYPE}_$bin->{NAME}\_OBJS)");
@{$bin->{LINK_FLAGS}} = ();
- $bin->{TARGET} = $bin->{OUTPUT} = "bin/$bin->{NAME}";
+ $bin->{TARGET} = $bin->{OUTPUT} = "bin/$components{$bin->{COMPONENT}}->{NAME}";
$bin->{BINARY} = $bin->{NAME};
}
sub create_output($)
{
- my $depend = shift;
- my $part;
+ my $subsystems = shift;
+ my $buildvars = shift;
+ my $components = shift;
- $depend->{PROTO} = {
- OUTPUT_TYPE => "OBJLIST",
+ $buildvars->{PROTO} = {
+ BUILD_TYPE => "OBJLIST",
TYPE => "PROTO",
NAME => "PROTO",
OBJ_LIST => []
};
- $depend->{ALL_OBJS} = {
+ $buildvars->{ALL_OBJS} = {
OUTPUT_TYPE => "OBJLIST",
TYPE => "",
NAME => "ALL_OBJS",
OBJ_LIST => []
};
- foreach $part (values %{$depend}) {
- next if $part->{NAME} eq "PROTO";
- next if $part->{NAME} eq "ALL_OBJS";
- next if not defined($part->{OUTPUT_TYPE});
+ foreach $part (values %{$subsystems}) {
+ next if $part->{NAME} eq "PROTO";
+ next if $part->{NAME} eq "ALL_OBJS";
+ next if not defined($part->{OUTPUT_TYPE});
- generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY";
- generate_objlist($part) if $part->{OUTPUT_TYPE} eq "OBJLIST";
- generate_shared_library($part) if $part->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
- generate_static_library($part) if $part->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
-
- # Combine object lists
- push(@{$part->{OBJ_LIST}}, @{$part->{INIT_OBJ_FILES}}) if defined($part->{INIT_OBJ_FILES});
- push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
- push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
-
- push(@{$depend->{ALL_OBJS}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
-
- if ((not defined ($part->{NOPROTO})) or ($part->{NOPROTO} eq "NO")) {
- push(@{$depend->{PROTO}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
- }
+ # Combine object lists
+ push(@{$part->{OBJ_LIST}}, @{$part->{INIT_OBJ_FILES}}) if defined($part->{INIT_OBJ_FILES});
+ push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
+ push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
+
+ push(@{$depend->{ALL_OBJS}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
+
+ if ((not defined ($part->{NOPROTO})) or ($part->{NOPROTO} eq "NO")) {
+ push(@{$buildvars->{PROTO}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
+ }
+
}
- foreach $part (values %{$depend}) {
- next if not defined($part->{OUTPUT_TYPE});
+ foreach $part (values %{$buildvars}) {
+ generate_static_library($subsystems, $buildvars, $components, $part) if $part->{BUILD_TYPE} eq "STATIC";
+ generate_shared_library($subsystems, $buildvars, $components, $part) if $part->{BUILD_TYPE} eq "SHARED";
+ generate_binary($subsystems, $buildvars, $components, $part) if $part->{BUILD_TYPE} eq "BINARY";
- foreach (@{$part->{DEPENDENCIES}}) {
- my $elem = $$_;
- push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
- }
+ if (undefined ($components->{$lib->{COMPONENT}}->{INCLUDES})) { die "INCLUDES not defined!"; }
- # Always import the CFLAGS and CPPFLAGS of the unique dependencies
- foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) {
- next if $elem == $part;
+ $part->{LINK_LIST}} = ();
- push(@{$part->{CPPFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}});
- push(@{$part->{CFLAGS}}, @{$elem->{CFLAGS}}) if defined(@{$elem->{CFLAGS}});
- push(@{$part->{LINK_LIST}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});
- push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
- push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
+ foreach my $elem (@{$components->{$lib->{COMPONENT}}->{INCLUDES}}) {
+ my $subsys = $subsystems->{$elem};
+ push(@{$part->{OBJ_LIST}}, "subs/$subsys->{NAME}.o") if defined ($subsys->{OBJ_LIST});
+ push(@{$part->{LIBS}}, @{$subsys->{LIBS}}) if defined($subsys->{LIBS});
+ push(@{$part->{LDFLAGS}},@{$subsys->{LDFLAGS}}) if defined($subsys->{LDFLAGS});
- push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if
- $part->{OUTPUT_TYPE} eq "BINARY" and
- defined($elem->{INIT_FUNCTION}) and
- $elem->{INIT_FUNCTION} ne "" and
- $part->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
- }
+ push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $subsys->{INIT_FUNCTION}) if
+ $part->{BUILD_TYPE} eq "BINARY" and
+ defined($subsys->{INIT_FUNCTION}) and
+ $subsys->{INIT_FUNCTION} ne "";
+ }
+
}
- return $depend;
+
+ return ($subsystems, $buildvars, $components);
}
1;
Index: source/utils/net/config.mk
===================================================================
--- source/utils/net/config.mk (revision 8528)
+++ source/utils/net/config.mk (working copy)
@@ -2,7 +2,7 @@
#################################
# Start BINARY net
-[BINARY::net]
+[SUBSYSTEM::bin_net]
OBJ_FILES = \
utils/net/net.o \
utils/net/net_password.o \
Index: source/utils/config.mk
===================================================================
--- source/utils/config.mk (revision 8528)
+++ source/utils/config.mk (working copy)
@@ -2,7 +2,7 @@
#################################
# Start BINARY ndrdump
-[BINARY::ndrdump]
+[SUBSYSTEM::bin_ndrdump]
OBJ_FILES = \
utils/ndrdump.o
REQUIRED_SUBSYSTEMS = \
@@ -18,7 +18,7 @@
#################################
# Start BINARY ntlm_auth
-[BINARY::ntlm_auth]
+[SUBSYSTEM::bin_ntlm_auth]
OBJ_FILES = \
utils/ntlm_auth.o
REQUIRED_SUBSYSTEMS = \
@@ -33,7 +33,7 @@
#################################
# Start BINARY getntacl
-[BINARY::getntacl]
+[SUBSYSTEM::bin_getntacl]
OBJ_FILES = \
utils/getntacl.o
REQUIRED_SUBSYSTEMS = \
@@ -47,7 +47,7 @@
#################################
# Start BINARY setntacl
-[BINARY::setntacl]
+[SUBSYSTEM::bin_setntacl]
OBJ_FILES = \
utils/setntacl.o
REQUIRED_SUBSYSTEMS = \
@@ -60,7 +60,7 @@
#################################
# Start BINARY setnttoken
-[BINARY::setnttoken]
+[SUBSYSTEM::bin_setnttoken]
OBJ_FILES = \
utils/setnttoken.o
REQUIRED_SUBSYSTEMS = \
@@ -75,7 +75,7 @@
#################################
# Start BINARY nmblookup
-[BINARY::nmblookup]
+[SUBSYSTEM::bin_nmblookup]
OBJ_FILES = \
utils/nmblookup.o
REQUIRED_SUBSYSTEMS = \
Index: source/ntvfs/unixuid/config.mk
===================================================================
--- source/ntvfs/unixuid/config.mk (revision 8528)
+++ source/ntvfs/unixuid/config.mk (working copy)
@@ -1,6 +1,6 @@
################################################
# Start MODULE ntvfs_unixuid
-[MODULE::ntvfs_unixuid]
+[SUBSYSTEM::ntvfs_unixuid]
INIT_FUNCTION = ntvfs_unixuid_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
Index: source/ntvfs/posix/config.mk
===================================================================
--- source/ntvfs/posix/config.mk (revision 8528)
+++ source/ntvfs/posix/config.mk (working copy)
@@ -1,6 +1,6 @@
################################################
# Start MODULE ntvfs_posix
-[MODULE::ntvfs_posix]
+[SUBSYSTEM::ntvfs_posix]
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_posix_init
INIT_OBJ_FILES = \
Index: source/ntvfs/config.mk
===================================================================
--- source/ntvfs/config.mk (revision 8528)
+++ source/ntvfs/config.mk (working copy)
@@ -2,7 +2,7 @@
################################################
# Start MODULE ntvfs_cifs
-[MODULE::ntvfs_cifs]
+[SUBSYSTEM::ntvfs_cifs]
INIT_FUNCTION = ntvfs_cifs_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
@@ -14,7 +14,7 @@
################################################
# Start MODULE ntvfs_simple
-[MODULE::ntvfs_simple]
+[SUBSYSTEM::ntvfs_simple]
INIT_FUNCTION = ntvfs_simple_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
@@ -26,7 +26,7 @@
################################################
# Start MODULE ntvfs_print
-[MODULE::ntvfs_print]
+[SUBSYSTEM::ntvfs_print]
INIT_FUNCTION = ntvfs_print_init
SUBSYSTEM = NTVFS
INIT_OBJ_FILES = \
@@ -36,7 +36,7 @@
################################################
# Start MODULE ntvfs_ipc
-[MODULE::ntvfs_ipc]
+[SUBSYSTEM::ntvfs_ipc]
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_ipc_init
INIT_OBJ_FILES = \
@@ -50,7 +50,7 @@
################################################
# Start MODULE ntvfs_nbench
-[MODULE::ntvfs_nbench]
+[SUBSYSTEM::ntvfs_nbench]
SUBSYSTEM = NTVFS
INIT_FUNCTION = ntvfs_nbench_init
INIT_OBJ_FILES = \
Index: source/torture/config.mk
===================================================================
--- source/torture/config.mk (revision 8528)
+++ source/torture/config.mk (working copy)
@@ -207,7 +207,7 @@
#################################
# Start BINARY smbtorture
-[BINARY::smbtorture]
+[SUBSYSTEM::bin_smbtorture]
OBJ_FILES = \
torture/torture.o \
torture/torture_util.o
@@ -232,7 +232,7 @@
#################################
# Start BINARY gentest
-[BINARY::gentest]
+[SUBSYSTEM::bin_gentest]
OBJ_FILES = \
torture/gentest.o \
torture/torture_util.o
@@ -248,7 +248,7 @@
#################################
# Start BINARY masktest
-[BINARY::masktest]
+[SUBSYSTEM::bin_masktest]
OBJ_FILES = \
torture/masktest.o
REQUIRED_SUBSYSTEMS = \
@@ -263,7 +263,7 @@
#################################
# Start BINARY locktest
-[BINARY::locktest]
+[SUBSYSTEM::bin_locktest]
OBJ_FILES = \
torture/locktest.o \
torture/torture_util.o
Index: source/client/config.mk
===================================================================
--- source/client/config.mk (revision 8528)
+++ source/client/config.mk (working copy)
@@ -2,7 +2,7 @@
#################################
# Start BINARY smbclient
-[BINARY::smbclient]
+[SUBSYSTEM::bin_smbclient]
OBJ_FILES = \
client/client.o
REQUIRED_SUBSYSTEMS = \
-------------- next part --------------
--
goodbye,
peter.
More information about the samba-technical
mailing list