From ceb6e9717bf8ea5c83a01e159a7006fd8651620c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Mar 2006 16:41:04 +0000 Subject: r13960: Generate makefile rules for installing/removing shared modules. (This used to be commit 2c746980328431ab04852dc668899e3eb042da99) --- source4/auth/config.mk | 18 ++--- source4/auth/credentials/config.mk | 4 +- source4/auth/gensec/config.mk | 20 +++--- source4/auth/ntlmssp/config.mk | 4 +- source4/build/smb_build/TODO | 13 ++-- source4/build/smb_build/makefile.pm | 15 +++- source4/dsdb/samdb/ldb_modules/config.mk | 16 ++--- source4/gtk/config.mk | 2 +- source4/kdc/config.mk | 4 +- source4/lib/basic.mk | 2 +- source4/lib/com/config.mk | 8 +-- source4/lib/ldb/config.mk | 32 ++++----- source4/lib/registry/config.mk | 26 +++---- source4/lib/tdb/config.mk | 2 +- source4/lib/util/config.mk | 2 +- source4/libcli/auth/config.mk | 2 +- source4/libcli/config.mk | 2 +- source4/libcli/ldap/config.mk | 2 +- source4/libcli/smb2/config.mk | 2 +- source4/librpc/config.mk | 114 +++++++++++++++---------------- source4/nbt_server/config.mk | 4 +- source4/ntptr/config.mk | 2 +- source4/ntvfs/config.mk | 12 ++-- source4/ntvfs/posix/config.mk | 2 +- source4/ntvfs/unixuid/config.mk | 2 +- source4/rpc_server/config.mk | 6 +- source4/scripting/ejs/config.mk | 4 +- source4/smb_server/smb/config.mk | 2 +- source4/smb_server/smb2/config.mk | 2 +- source4/smbd/config.mk | 2 +- source4/torture/config.mk | 4 +- source4/torture/local/config.mk | 2 +- 32 files changed, 172 insertions(+), 162 deletions(-) (limited to 'source4') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 7372f563de..a64ceb5da1 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -1,4 +1,4 @@ -# AUTH Server subsystem +# auth Server subsystem include gensec/config.mk include kerberos/config.mk include ntlmssp/config.mk @@ -9,7 +9,7 @@ include credentials/config.mk [MODULE::auth_sam] PRIVATE_PROTO_HEADER = auth_sam.h INIT_FUNCTION = auth_sam_init -SUBSYSTEM = AUTH +SUBSYSTEM = auth OBJ_FILES = \ auth_sam.o REQUIRED_SUBSYSTEMS = \ @@ -21,7 +21,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE auth_anonymous [MODULE::auth_anonymous] INIT_FUNCTION = auth_anonymous_init -SUBSYSTEM = AUTH +SUBSYSTEM = auth OBJ_FILES = \ auth_anonymous.o # End MODULE auth_anonymous @@ -31,7 +31,7 @@ OBJ_FILES = \ # Start MODULE auth_winbind [MODULE::auth_winbind] INIT_FUNCTION = auth_winbind_init -SUBSYSTEM = AUTH +SUBSYSTEM = auth OBJ_FILES = \ auth_winbind.o REQUIRED_SUBSYSTEMS = \ @@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE auth_developer [MODULE::auth_developer] INIT_FUNCTION = auth_developer_init -SUBSYSTEM = AUTH +SUBSYSTEM = auth OBJ_FILES = \ auth_developer.o # End MODULE auth_developer @@ -54,7 +54,7 @@ OBJ_FILES = \ # Start MODULE auth_unix [MODULE::auth_unix] INIT_FUNCTION = auth_unix_init -SUBSYSTEM = AUTH +SUBSYSTEM = auth OBJ_FILES = \ auth_unix.o REQUIRED_SUBSYSTEMS = \ @@ -67,8 +67,8 @@ PRIVATE_PROTO_HEADER = pam_errors.h OBJ_FILES = pam_errors.o ####################### -# Start SUBSYSTEM AUTH -[SUBSYSTEM::AUTH] +# Start SUBSYSTEM auth +[SUBSYSTEM::auth] PRIVATE_PROTO_HEADER = auth_proto.h OBJ_FILES = \ auth.o \ @@ -77,5 +77,5 @@ OBJ_FILES = \ ntlm_check.o \ auth_simple.o REQUIRED_SUBSYSTEMS = LIB_SECURITY -# End SUBSYSTEM AUTH +# End SUBSYSTEM auth ####################### diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 96c48f7574..586add9c14 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -1,5 +1,5 @@ ################################# -# Start SUBSYSTEM GENSEC +# Start SUBSYSTEM gensec [SUBSYSTEM::CREDENTIALS] PRIVATE_PROTO_HEADER = credentials_proto.h OBJ_FILES = credentials.o \ @@ -7,7 +7,7 @@ OBJ_FILES = credentials.o \ credentials_krb5.o \ credentials_ntlm.o REQUIRED_SUBSYSTEMS = \ - HEIMDAL LIBCLI_AUTH LIBLDB SECRETS + HEIMDAL LIBCLI_AUTH ldb SECRETS # End SUBSYSTEM CREDENTIALS ################################# diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 79b6cdda09..b72745dacc 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -1,6 +1,6 @@ ################################# -# Start SUBSYSTEM GENSEC -[LIBRARY::GENSEC] +# Start SUBSYSTEM gensec +[LIBRARY::gensec] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = Generic Security Library @@ -10,33 +10,33 @@ PRIVATE_PROTO_HEADER = gensec_proto.h OBJ_FILES = gensec.o REQUIRED_SUBSYSTEMS = \ CREDENTIALS -# End SUBSYSTEM GENSEC +# End SUBSYSTEM gensec ################################# ################################################ # Start MODULE gensec_krb5 [MODULE::gensec_krb5] -SUBSYSTEM = GENSEC +SUBSYSTEM = gensec INIT_FUNCTION = gensec_krb5_init OBJ_FILES = gensec_krb5.o -REQUIRED_SUBSYSTEMS = KERBEROS AUTH +REQUIRED_SUBSYSTEMS = KERBEROS auth # End MODULE gensec_krb5 ################################################ ################################################ # Start MODULE gensec_gssapi [MODULE::gensec_gssapi] -SUBSYSTEM = GENSEC +SUBSYSTEM = gensec INIT_FUNCTION = gensec_gssapi_init OBJ_FILES = gensec_gssapi.o -REQUIRED_SUBSYSTEMS = KERBEROS AUTH +REQUIRED_SUBSYSTEMS = KERBEROS auth # End MODULE gensec_gssapi ################################################ ################################################ # Start MODULE gensec_spnego [MODULE::gensec_spnego] -SUBSYSTEM = GENSEC +SUBSYSTEM = gensec INIT_FUNCTION = gensec_spnego_init PRIVATE_PROTO_HEADER = spnego_proto.h OBJ_FILES = spnego.o \ @@ -47,12 +47,12 @@ OBJ_FILES = spnego.o \ ################################################ # Start MODULE gensec_schannel [MODULE::gensec_schannel] -SUBSYSTEM = GENSEC +SUBSYSTEM = gensec PRIVATE_PROTO_HEADER = schannel_proto.h INIT_FUNCTION = gensec_schannel_init OBJ_FILES = schannel.o \ schannel_sign.o -REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB NDR_SCHANNEL +REQUIRED_SUBSYSTEMS = auth SCHANNELDB NDR_SCHANNEL # End MODULE gensec_schannel ################################################ diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk index 55a9e09971..eb09a199f0 100644 --- a/source4/auth/ntlmssp/config.mk +++ b/source4/auth/ntlmssp/config.mk @@ -1,7 +1,7 @@ ################################################ # Start MODULE gensec_ntlmssp [MODULE::gensec_ntlmssp] -SUBSYSTEM = GENSEC +SUBSYSTEM = gensec NOPROTO = NO INIT_FUNCTION = gensec_ntlmssp_init PRIVATE_PROTO_HEADER = proto.h @@ -10,6 +10,6 @@ OBJ_FILES = ntlmssp.o \ ntlmssp_client.o \ ntlmssp_parse.o \ ntlmssp_server.o -REQUIRED_SUBSYSTEMS = AUTH +REQUIRED_SUBSYSTEMS = auth # End MODULE gensec_ntlmssp ################################################ diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index 6b5ebbb8ba..69c8d98fc7 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -1,11 +1,10 @@ -- for each subsystem: - - include line in Makefile - - rule in Makefile - - - sonames -- get rid of include/structs.h +- saner names for some of the .pc files +- get rid of include/structs.h and include/proto.h - add register function to smbtorture -- install shared modules - improve (un)install scripts (rewrite in perl?) -- proper #include dependencies +- proper #include dependencies: + for each subsystem: + - include line in Makefile + - rule in Makefile - determine dependencies from #include lines ? diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 269deb5ddd..44b54a5058 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -24,6 +24,8 @@ sub new($$$) $self->{static_libs} = []; $self->{shared_libs} = []; $self->{headers} = []; + $self->{install_plugins} = ""; + $self->{uninstall_plugins} = ""; $self->{pc_files} = []; $self->{proto_headers} = []; $self->{output} = ""; @@ -264,8 +266,14 @@ sub SharedLibrary($$) $installdir = "bin"; } - push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}"); - push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}"); + if ($ctx->{TYPE} eq "LIBRARY") { + push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}"); + } elsif ($ctx->{TYPE} eq "MODULE") { + push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}"); + + $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n"; + $self->{uninstall_plugins} .= "\t\@rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n"; + } $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "CFLAGS"); @@ -552,6 +560,9 @@ sub write($$) $self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) . "\n"); $self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n"); + $self->output("\ninstallplugins: \$(SHARED_MODULES)\n".$self->{install_plugins}."\n"); + $self->output("\nuninstallplugins:\n".$self->{uninstall_plugins}."\n"); + $self->_prepare_mk_files(); if ($self->{developer}) { diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 8eedc5a983..1afdb2d35b 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -1,7 +1,7 @@ ################################################ # Start MODULE libldb_objectguid [MODULE::libldb_objectguid] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = objectguid_module_init OBJ_FILES = \ objectguid.o @@ -13,7 +13,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start MODULE libldb_samldb [MODULE::libldb_samldb] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = samldb_module_init OBJ_FILES = \ samldb.o @@ -25,7 +25,7 @@ REQUIRED_SUBSYSTEMS = SAMDB ################################################ # Start MODULE libldb_samba3sam [MODULE::libldb_samba3sam] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_samba3sam_module_init ENABLE = NO OBJ_FILES = \ @@ -37,7 +37,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_proxy [MODULE::libldb_proxy] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = proxy_module_init OBJ_FILES = \ proxy.o @@ -49,7 +49,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_rootdse [MODULE::libldb_rootdse] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = rootdse_module_init OBJ_FILES = \ rootdse.o @@ -60,7 +60,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_password_hash [MODULE::libldb_password_hash] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = password_hash_module_init OBJ_FILES = \ password_hash.o @@ -73,7 +73,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start MODULE libldb_cludge_acl [MODULE::libldb_kludge_acl] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_kludge_acl_init OBJ_FILES = \ kludge_acl.o @@ -86,7 +86,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start MODULE libldb_extended_dn [MODULE::libldb_extended_dn] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_extended_dn_init OBJ_FILES = \ extended_dn.o diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk index 56c4971320..0a77a166e5 100644 --- a/source4/gtk/config.mk +++ b/source4/gtk/config.mk @@ -16,7 +16,7 @@ REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR [BINARY::gregedit] INSTALLDIR = BINDIR OBJ_FILES = tools/gregedit.o -REQUIRED_SUBSYSTEMS = CONFIG REGISTRY GTK_SAMBA +REQUIRED_SUBSYSTEMS = CONFIG registry GTK_SAMBA MANPAGE = man/gregedit.1 [BINARY::gepdump] diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk index 32f10c93a5..8a62e8be63 100644 --- a/source4/kdc/config.mk +++ b/source4/kdc/config.mk @@ -8,7 +8,7 @@ OBJ_FILES = \ kdc.o \ kpasswdd.o REQUIRED_SUBSYSTEMS = \ - LIBLDB KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB + ldb KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB # End SUBSYSTEM KDC ####################### @@ -20,7 +20,7 @@ OBJ_FILES = \ hdb-ldb.o \ pac-glue.o REQUIRED_SUBSYSTEMS = \ - LIBLDB KERBEROS_LIB HEIMDAL_HDB + ldb KERBEROS_LIB HEIMDAL_HDB # End SUBSYSTEM KDC ####################### diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 43e838967b..0ed7a69146 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -60,4 +60,4 @@ OBJ_FILES = \ PRIVATE_PROTO_HEADER = db_wrap_proto.h OBJ_FILES = db_wrap.o \ gendb.o -REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB LDBSAMBA +REQUIRED_SUBSYSTEMS = ldb LIBTDB LDBSAMBA diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index 5933168885..f0c13886d0 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,19 +1,19 @@ -[SUBSYSTEM::COM] +[SUBSYSTEM::com] PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ tables.o \ rot.o \ main.o -[SUBSYSTEM::DCOM] +[SUBSYSTEM::dcom] PRIVATE_PROTO_HEADER = dcom/proto.h OBJ_FILES = \ dcom/main.o \ dcom/tables.o -REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \ +REQUIRED_SUBSYSTEMS = com DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER [MODULE::com_simple] -SUBSYSTEM = COM +SUBSYSTEM = com OBJ_FILES = classes/simple.o INIT_FUNCTION = com_simple_init diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 3834ac0213..b87c816402 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -2,7 +2,7 @@ # Start MODULE libldb_asq [MODULE::libldb_asq] INIT_FUNCTION = ldb_asq_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/asq.o # End MODULE libldb_asq @@ -12,7 +12,7 @@ OBJ_FILES = \ # Start MODULE libldb_sort [MODULE::libldb_sort] INIT_FUNCTION = ldb_sort_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/sort.o # End MODULE libldb_sort @@ -22,7 +22,7 @@ OBJ_FILES = \ # Start MODULE libldb_paged_results [MODULE::libldb_paged_results] INIT_FUNCTION = ldb_paged_results_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/paged_results.o # End MODULE libldb_paged_results @@ -31,7 +31,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_operational [MODULE::libldb_operational] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_operational_init OBJ_FILES = \ modules/operational.o @@ -42,7 +42,7 @@ OBJ_FILES = \ # Start MODULE libldb_objectclass [MODULE::libldb_objectclass] INIT_FUNCTION = ldb_objectclass_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/objectclass.o # End MODULE libldb_objectclass @@ -51,7 +51,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_rdn_name [MODULE::libldb_rdn_name] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_rdn_name_init OBJ_FILES = \ modules/rdn_name.o @@ -62,7 +62,7 @@ OBJ_FILES = \ # Start MODULE libldb_schema [MODULE::libldb_schema] INIT_FUNCTION = ldb_schema_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/schema.o # End MODULE libldb_schema @@ -71,7 +71,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_ildap [MODULE::libldb_ildap] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_ildap_init OBJ_FILES = \ ldb_ildap/ldb_ildap.o @@ -84,7 +84,7 @@ NOPROTO = YES ################################################ # Start MODULE libldb_map [MODULE::libldb_map] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = modules/ldb_map.o # End MODULE libldb_map ################################################ @@ -92,7 +92,7 @@ OBJ_FILES = modules/ldb_map.o ################################################ # Start MODULE libldb_skel [MODULE::libldb_skel] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_skel_init OBJ_FILES = modules/skel.o # End MODULE libldb_skel @@ -101,7 +101,7 @@ OBJ_FILES = modules/skel.o ################################################ # Start MODULE libldb_sqlite3 [MODULE::libldb_sqlite3] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_sqlite3_init OBJ_FILES = \ ldb_sqlite3/ldb_sqlite3.o @@ -114,7 +114,7 @@ NOPROTO = YES ################################################ # Start MODULE libldb_tdb [MODULE::libldb_tdb] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_tdb_init OBJ_FILES = \ ldb_tdb/ldb_tdb.o \ @@ -130,8 +130,8 @@ NOPROTO = YES ################################################ ################################################ -# Start SUBSYSTEM LIBLDB -[LIBRARY::LIBLDB] +# Start SUBSYSTEM ldb +[LIBRARY::ldb] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = LDAP-like embedded database library @@ -157,7 +157,7 @@ NOPROTO = YES MANPAGE = man/ldb.3 PUBLIC_HEADERS = include/ldb.h # -# End SUBSYSTEM LIBLDB +# End SUBSYSTEM ldb ################################################ ################################################ @@ -175,7 +175,7 @@ OBJ_FILES = \ NOPROTO = YES OBJ_FILES= \ tools/cmdline.o -REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS +REQUIRED_SUBSYSTEMS = ldb LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 5c68bacd94..173d7bc5a4 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -4,7 +4,7 @@ # Start MODULE registry_nt4 [MODULE::registry_nt4] INIT_FUNCTION = registry_nt4_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_nt4.o REQUIRED_SUBSYSTEMS = TDR_REGF @@ -26,7 +26,7 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl # Start MODULE registry_w95 [MODULE::registry_w95] INIT_FUNCTION = registry_w95_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_w95.o # End MODULE registry_w95 @@ -36,7 +36,7 @@ OBJ_FILES = \ # Start MODULE registry_dir [MODULE::registry_dir] INIT_FUNCTION = registry_dir_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_dir.o # End MODULE registry_dir @@ -48,7 +48,7 @@ OBJ_FILES = \ INIT_FUNCTION = registry_rpc_init PRIVATE_PROTO_HEADER = reg_backend_rpc.h OUTPUT_TYPE = MERGEDOBJ -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_rpc.o REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG @@ -61,7 +61,7 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG # Start MODULE registry_gconf [MODULE::registry_gconf] INIT_FUNCTION = registry_gconf_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_gconf.o REQUIRED_SUBSYSTEMS = EXT_LIB_gconf @@ -72,17 +72,17 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf # Start MODULE registry_ldb [MODULE::registry_ldb] INIT_FUNCTION = registry_ldb_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_ldb.o REQUIRED_SUBSYSTEMS = \ - LIBLDB + ldb # End MODULE registry_ldb ################################################ ################################################ -# Start SUBSYSTEM REGISTRY -[LIBRARY::REGISTRY] +# Start SUBSYSTEM registry +[LIBRARY::registry] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = Windows-style registry library @@ -106,7 +106,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regdiff.o REQUIRED_SUBSYSTEMS = \ - CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS + CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regdiff.1 # End BINARY regdiff ################################################ @@ -118,7 +118,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regpatch.o REQUIRED_SUBSYSTEMS = \ - CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS + CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regpatch.1 # End BINARY regpatch ################################################ @@ -130,7 +130,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regshell.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS LIBREADLINE + CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE MANPAGE = man/regshell.1 # End BINARY regshell ################################################ @@ -142,7 +142,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regtree.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS + CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 76e0eade85..c9785775d1 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = \ LIBREPLACE PUBLIC_HEADERS = include/tdb.h # -# End SUBSYSTEM LIBLDB +# End SUBSYSTEM ldb ################################################ ################################################ diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 2b2c440e4b..24e36dc72e 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -36,7 +36,7 @@ REQUIRED_SUBSYSTEMS = \ CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \ SOCKET_WRAPPER CONFIG \ # for the base64 functions - LIBLDB + ldb [SUBSYSTEM::PIDFILE] PRIVATE_PROTO_HEADER = pidfile.h diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk index c879c60956..d11f440864 100644 --- a/source4/libcli/auth/config.mk +++ b/source4/libcli/auth/config.mk @@ -6,6 +6,6 @@ OBJ_FILES = credentials.o \ session.o \ smbencrypt.o REQUIRED_SUBSYSTEMS = \ - AUTH SCHANNELDB gensec_ntlmssp + auth SCHANNELDB gensec_ntlmssp # End SUBSYSTEM LIBCLI_AUTH ################################# diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 548b7e8e40..1c030e0d0d 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -143,6 +143,6 @@ OBJ_FILES = raw/rawfile.o \ raw/rawacl.o \ raw/rawdate.o \ raw/rawlpq.o -REQUIRED_SUBSYSTEMS = LIBPACKET GENSEC +REQUIRED_SUBSYSTEMS = LIBPACKET gensec include smb2/config.mk diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk index 59d2d1ea30..c0ad8d157f 100644 --- a/source4/libcli/ldap/config.mk +++ b/source4/libcli/ldap/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = ldap.o \ ldap_ndr.o \ ldap_ildap.o \ ldap_controls.o -REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET NDR_SAMR LIBTLS \ +REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS gensec SOCKET NDR_SAMR LIBTLS \ LIBPACKET # End SUBSYSTEM LIBCLI_LDAP ################################# diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk index 391cd10302..929a6135fa 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 +REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET gensec diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 52748315ef..768c186a63 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -329,97 +329,97 @@ REQUIRED_SUBSYSTEMS = NDR_IFACE_TABLE NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHA [SUBSYSTEM::RPC_NDR_ROT] OBJ_FILES = gen_ndr/ndr_rot_c.o -REQUIRED_SUBSYSTEMS = NDR_ROT LIBDCERPC +REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc NOPROTO = YES [SUBSYSTEM::RPC_NDR_AUDIOSRV] OBJ_FILES = gen_ndr/ndr_audiosrv_c.o -REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV LIBDCERPC +REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc NOPROTO = YES [SUBSYSTEM::RPC_NDR_ECHO] OBJ_FILES = gen_ndr/ndr_echo_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ECHO +REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO NOPROTO = YES [SUBSYSTEM::RPC_NDR_EXCHANGE] OBJ_FILES = gen_ndr/ndr_exchange_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EXCHANGE +REQUIRED_SUBSYSTEMS = dcerpc NDR_EXCHANGE NOPROTO = YES [SUBSYSTEM::RPC_NDR_DSBACKUP] OBJ_FILES = gen_ndr/ndr_dsbackup_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DSBACKUP +REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP NOPROTO = YES [SUBSYSTEM::RPC_NDR_EFS] OBJ_FILES = gen_ndr/ndr_efs_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EFS +REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS NOPROTO = YES [SUBSYSTEM::RPC_NDR_LSA] OBJ_FILES = gen_ndr/ndr_lsa_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_LSA +REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA NOPROTO = YES [SUBSYSTEM::RPC_NDR_DFS] OBJ_FILES = gen_ndr/ndr_dfs_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DFS +REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS NOPROTO = YES [SUBSYSTEM::RPC_NDR_DRSUAPI] OBJ_FILES = gen_ndr/ndr_drsuapi_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSUAPI +REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI NOPROTO = YES [SUBSYSTEM::RPC_NDR_DRSBLOBS] OBJ_FILES = gen_ndr/ndr_drsblobs_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSBLOBS +REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSBLOBS NOPROTO = YES [SUBSYSTEM::RPC_NDR_POLICYAGENT] OBJ_FILES = gen_ndr/ndr_policyagent_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_POLICYAGENT +REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT NOPROTO = YES [SUBSYSTEM::RPC_NDR_UNIXINFO] OBJ_FILES = gen_ndr/ndr_unixinfo_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_UNIXINFO +REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO NOPROTO = YES [SUBSYSTEM::RPC_NDR_SAMR] OBJ_FILES = gen_ndr/ndr_samr_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SAMR +REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR NOPROTO = YES [SUBSYSTEM::RPC_NDR_SPOOLSS] OBJ_FILES = gen_ndr/ndr_spoolss_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SPOOLSS +REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS NOPROTO = YES [SUBSYSTEM::RPC_NDR_WKSSVC] OBJ_FILES = gen_ndr/ndr_wkssvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WKSSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_SRVSVC] OBJ_FILES = gen_ndr/ndr_srvsvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SRVSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_SVCCTL] OBJ_FILES = gen_ndr/ndr_svcctl_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SVCCTL +REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL NOPROTO = YES [SUBSYSTEM::RPC_NDR_ATSVC] OBJ_FILES = gen_ndr/ndr_atsvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ATSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_EVENTLOG] OBJ_FILES = gen_ndr/ndr_eventlog_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EVENTLOG +REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG NOPROTO = YES [SUBSYSTEM::RPC_NDR_EPMAPPER] @@ -429,82 +429,82 @@ NOPROTO = YES [SUBSYSTEM::RPC_NDR_DBGIDL] OBJ_FILES = gen_ndr/ndr_dbgidl_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DBGIDL +REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL NOPROTO = YES [SUBSYSTEM::RPC_NDR_DSSETUP] OBJ_FILES = gen_ndr/ndr_dssetup_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DSSETUP +REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP NOPROTO = YES [SUBSYSTEM::RPC_NDR_MSGSVC] OBJ_FILES = gen_ndr/ndr_msgsvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MSGSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_WINS] OBJ_FILES = gen_ndr/ndr_wins_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINS +REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS NOPROTO = YES [SUBSYSTEM::RPC_NDR_WINREG] OBJ_FILES = gen_ndr/ndr_winreg_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINREG +REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG NOPROTO = YES [SUBSYSTEM::RPC_NDR_INITSHUTDOWN] OBJ_FILES = gen_ndr/ndr_initshutdown_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_INITSHUTDOWN +REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN NOPROTO = YES [SUBSYSTEM::RPC_NDR_MGMT] OBJ_FILES = gen_ndr/ndr_mgmt_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MGMT +REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT NOPROTO = YES [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE] OBJ_FILES = gen_ndr/ndr_protected_storage_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_PROTECTED_STORAGE +REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE NOPROTO = YES [SUBSYSTEM::DCOM_PROXY_DCOM] OBJ_FILES = gen_ndr/ndr_dcom_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DCOM +REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM NOPROTO = YES [SUBSYSTEM::RPC_NDR_OXIDRESOLVER] OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_OXIDRESOLVER +REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER NOPROTO = YES [SUBSYSTEM::RPC_NDR_REMACT] OBJ_FILES = gen_ndr/ndr_remact_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_REMACT +REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT NOPROTO = YES [SUBSYSTEM::RPC_NDR_WZCSVC] OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WZCSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_BROWSER] OBJ_FILES = gen_ndr/ndr_browser_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_BROWSER +REQUIRED_SUBSYSTEMS = dcerpc NDR_BROWSER NOPROTO = YES [SUBSYSTEM::RPC_NDR_W32TIME] OBJ_FILES = gen_ndr/ndr_w32time_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_W32TIME +REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME NOPROTO = YES [SUBSYSTEM::RPC_NDR_SCERPC] OBJ_FILES = gen_ndr/ndr_scerpc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SCERPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC NOPROTO = YES [SUBSYSTEM::RPC_NDR_NTSVCS] OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_NTSVCS +REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS NOPROTO = YES [SUBSYSTEM::RPC_NDR_NETLOGON] @@ -514,17 +514,17 @@ NOPROTO = YES [SUBSYSTEM::RPC_NDR_TRKWKS] OBJ_FILES = gen_ndr/ndr_trkwks_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_TRKWKS +REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS NOPROTO = YES [SUBSYSTEM::RPC_NDR_KEYSVC] OBJ_FILES = gen_ndr/ndr_keysvc_c.o -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_KEYSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC NOPROTO = YES ################################################ -# Start SUBSYSTEM LIBDCERPC -[LIBRARY::LIBDCERPC] +# Start SUBSYSTEM dcerpc +[LIBRARY::dcerpc] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = DCE/RPC client library @@ -541,57 +541,57 @@ OBJ_FILES = \ rpc/dcerpc_smb2.o \ rpc/dcerpc_sock.o \ rpc/dcerpc_connect.o -REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER GENSEC -# End SUBSYSTEM LIBDCERPC +REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER gensec +# End SUBSYSTEM dcerpc ################################################ [MODULE::RPC_EJS_ECHO] INIT_FUNCTION = ejs_init_rpcecho OBJ_FILES = gen_ndr/ndr_echo_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ECHO +REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO NOPROTO = YES [MODULE::RPC_EJS_MISC] INIT_FUNCTION = ejs_init_misc OBJ_FILES = gen_ndr/ndr_misc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MISC +REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC NOPROTO = YES [MODULE::RPC_EJS_SAMR] INIT_FUNCTION = ejs_init_samr OBJ_FILES = gen_ndr/ndr_samr_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SAMR +REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR NOPROTO = YES [MODULE::RPC_EJS_SECURITY] INIT_FUNCTION = ejs_init_security OBJ_FILES = gen_ndr/ndr_security_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SECURITY +REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY NOPROTO = YES [MODULE::RPC_EJS_LSA] INIT_FUNCTION = ejs_init_lsarpc OBJ_FILES = gen_ndr/ndr_lsa_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_LSA +REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA NOPROTO = YES [MODULE::RPC_EJS_DFS] INIT_FUNCTION = ejs_init_netdfs OBJ_FILES = gen_ndr/ndr_dfs_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DFS +REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS NOPROTO = YES [MODULE::RPC_EJS_DRSUAPI] INIT_FUNCTION = ejs_init_drsuapi OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSUAPI +REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI NOPROTO = YES [MODULE::RPC_EJS_SPOOLSS] @@ -599,61 +599,61 @@ INIT_FUNCTION = ejs_init_spoolss OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o SUBSYSTEM = SMBCALLS ENABLE = NO -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SPOOLSS +REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS NOPROTO = YES [MODULE::RPC_EJS_WKSSVC] INIT_FUNCTION = ejs_init_wkssvc OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WKSSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC NOPROTO = YES [MODULE::RPC_EJS_SRVSVC] INIT_FUNCTION = ejs_init_srvsvc OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SRVSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC NOPROTO = YES [MODULE::RPC_EJS_EVENTLOG] INIT_FUNCTION = ejs_init_eventlog OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EVENTLOG +REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG NOPROTO = YES [MODULE::RPC_EJS_WINREG] INIT_FUNCTION = ejs_init_winreg OBJ_FILES = gen_ndr/ndr_winreg_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINREG +REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG NOPROTO = YES [MODULE::RPC_EJS_INITSHUTDOWN] INIT_FUNCTION = ejs_init_initshutdown OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_INITSHUTDOWN +REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN NOPROTO = YES [MODULE::RPC_EJS_NETLOGON] INIT_FUNCTION = ejs_init_netlogon OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_NETLOGON +REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON NOPROTO = YES [MODULE::RPC_EJS_SVCCTL] INIT_FUNCTION = ejs_init_svcctl OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SVCCTL +REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL NOPROTO = YES [MODULE::RPC_EJS_IRPC] INIT_FUNCTION = ejs_init_irpc OBJ_FILES = gen_ndr/ndr_irpc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_IRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC NOPROTO = YES diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk index f7116a1c61..a8e9146639 100644 --- a/source4/nbt_server/config.mk +++ b/source4/nbt_server/config.mk @@ -8,14 +8,14 @@ OBJ_FILES = \ wins/wins_hook.o PRIVATE_PROTO_HEADER = wins/winsdb_proto.h REQUIRED_SUBSYSTEMS = \ - LIBLDB + ldb # End SUBSYSTEM WINSDB ####################### ####################### # Start MODULE libldb_wins_ldb [MODULE::libldb_wins_ldb] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = wins_ldb_module_init OBJ_FILES = \ wins/wins_ldb.o diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk index d425f57ca4..b2300c22b2 100644 --- a/source4/ntptr/config.mk +++ b/source4/ntptr/config.mk @@ -8,7 +8,7 @@ SUBSYSTEM = NTPTR OBJ_FILES = \ simple_ldb/ntptr_simple_ldb.o REQUIRED_SUBSYSTEMS = \ - LIBLDB + ldb # End MODULE ntptr_simple_ldb ################################################ diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index 84ec59e028..4ed2bcf7c3 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -6,7 +6,7 @@ include unixuid/config.mk # Start MODULE ntvfs_cifs [MODULE::ntvfs_cifs] INIT_FUNCTION = ntvfs_cifs_init -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs OBJ_FILES = \ cifs/vfs_cifs.o REQUIRED_SUBSYSTEMS = \ @@ -18,7 +18,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE ntvfs_simple [MODULE::ntvfs_simple] INIT_FUNCTION = ntvfs_simple_init -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs PRIVATE_PROTO_HEADER = simple/proto.h OBJ_FILES = \ simple/vfs_simple.o \ @@ -30,7 +30,7 @@ OBJ_FILES = \ # Start MODULE ntvfs_print [MODULE::ntvfs_print] INIT_FUNCTION = ntvfs_print_init -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs OBJ_FILES = \ print/vfs_print.o # End MODULE ntvfs_print @@ -39,7 +39,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ntvfs_ipc [MODULE::ntvfs_ipc] -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs INIT_FUNCTION = ntvfs_ipc_init PRIVATE_PROTO_HEADER = ipc/proto.h OBJ_FILES = \ @@ -54,7 +54,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ntvfs_nbench [MODULE::ntvfs_nbench] -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs INIT_FUNCTION = ntvfs_nbench_init OBJ_FILES = \ nbench/vfs_nbench.o @@ -64,7 +64,7 @@ OBJ_FILES = \ ################################################ # Start SUBSYSTEM NTVFS -[LIBRARY::NTVFS] +[LIBRARY::ntvfs] PUBLIC_HEADERS = ntvfs.h MAJOR_VERSION = 0 MINOR_VERSION = 0 diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 85fcc10e06..ccf2c2d1a9 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -1,7 +1,7 @@ ################################################ # Start MODULE ntvfs_posix [MODULE::ntvfs_posix] -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs INIT_FUNCTION = ntvfs_posix_init PRIVATE_PROTO_HEADER = vfs_posix_proto.h OBJ_FILES = \ diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk index bb811bca2b..3fdeb79e3d 100644 --- a/source4/ntvfs/unixuid/config.mk +++ b/source4/ntvfs/unixuid/config.mk @@ -2,7 +2,7 @@ # Start MODULE ntvfs_unixuid [MODULE::ntvfs_unixuid] INIT_FUNCTION = ntvfs_unixuid_init -SUBSYSTEM = NTVFS +SUBSYSTEM = ntvfs OBJ_FILES = \ vfs_unixuid.o # End MODULE ntvfs_unixuid diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index ced4701e09..2ef28a0af3 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -25,7 +25,7 @@ OBJ_FILES = \ librpc/gen_ndr/ndr_dcom_d.o REQUIRED_SUBSYSTEMS = \ DCERPC_COMMON \ - DCOM + dcom # End MODULE dcerpc_dcom ################################################ @@ -125,7 +125,7 @@ OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ winreg/rpc_winreg.o REQUIRED_SUBSYSTEMS = \ - REGISTRY NDR_WINREG + registry NDR_WINREG # End MODULE dcerpc_winreg ################################################ @@ -212,7 +212,7 @@ OBJ_FILES = \ REQUIRED_SUBSYSTEMS = \ LIBCLI_AUTH \ LIBNDR \ - LIBDCERPC + dcerpc # # End SUBSYSTEM DCERPC ################################################ diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 1376234d51..3e71e48196 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -31,11 +31,11 @@ OBJ_FILES = \ ejsnet.o \ mprutil.o REQUIRED_SUBSYSTEMS = \ - AUTH EJS LIBBASIC \ + auth EJS LIBBASIC \ EJSRPC MESSAGING LIBSAMBA3 \ LIBNET LIBSMB LIBPOPT \ POPT_CREDENTIALS POPT_SAMBA \ - LIBDCERPC \ + dcerpc \ NDR_ALL \ RPC_EJS_SECURITY \ RPC_EJS_LSA \ diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk index 2f0da23072..d4d55b5cdc 100644 --- a/source4/smb_server/smb/config.mk +++ b/source4/smb_server/smb/config.mk @@ -15,6 +15,6 @@ OBJ_FILES = \ trans2.o \ signing.o REQUIRED_SUBSYSTEMS = \ - NTVFS LIBPACKET + ntvfs LIBPACKET # End SUBSYSTEM SMB_PROTOCOL ####################### diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk index 686f6f783c..bc3d418094 100644 --- a/source4/smb_server/smb2/config.mk +++ b/source4/smb_server/smb2/config.mk @@ -10,6 +10,6 @@ OBJ_FILES = \ fileio.o \ keepalive.o REQUIRED_SUBSYSTEMS = \ - NTVFS LIBPACKET LIBCLI_SMB2 + ntvfs LIBPACKET LIBCLI_SMB2 # End SUBSYSTEM SMB2_PROTOCOL ####################### diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 5e862f2b6b..3dfe129db7 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -6,7 +6,7 @@ INIT_FUNCTION = server_service_auth_init SUBSYSTEM = SERVER_SERVICE REQUIRED_SUBSYSTEMS = \ - AUTH + auth # End MODULE server_auth ################################################ diff --git a/source4/torture/config.mk b/source4/torture/config.mk index c680468484..40a8a088ca 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -71,7 +71,7 @@ PRIVATE_PROTO_HEADER = \ OBJ_FILES = \ com/simple.o REQUIRED_SUBSYSTEMS = \ - COM DCOM + com dcom # End SUBSYSTEM TORTURE_COM ################################# @@ -149,7 +149,7 @@ OBJ_FILES = \ auth/ntlmssp.o \ auth/pac.o REQUIRED_SUBSYSTEMS = \ - LIBSMB GENSEC AUTH + LIBSMB gensec auth # End SUBSYSTEM TORTURE_AUTH ################################# diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 7ee7a13d58..84d439e216 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -20,7 +20,7 @@ OBJ_FILES = \ REQUIRED_SUBSYSTEMS = \ LIBSMB \ MESSAGING \ - REGISTRY + registry # End SUBSYSTEM TORTURE_LOCAL ################################# -- cgit