[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2429-g58626eb
Michael Adam
obnox at samba.org
Tue Feb 19 10:01:16 GMT 2008
The branch, v3-2-test has been updated
via 58626eb6027f43495a030d856232a81225d0ca77 (commit)
from d08a3a195718725228bbafa61fd4f0be8aafb43f (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 58626eb6027f43495a030d856232a81225d0ca77
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 19 11:01:00 2008 +0100
Makefile.in: Rework registry-related object collections.
Group and name objects more sanely.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 85 ++++++++++++++++++++++++---------------------------
1 files changed, 40 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 920d56b..42cc12a 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -358,7 +358,7 @@ READLINE_OBJ = lib/readline.o
POPT_LIB_OBJ = lib/popt_common.o
PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o param/params.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o
-PARAM_REG_ADD_OBJ = $(REG_API_OBJ) $(LIBNET_CONF_OBJ) $(REGOBJS_OBJ) $(PRIVILEGES_BASIC_OBJ)
+PARAM_REG_ADD_OBJ = $(REG_SMBCONF_OBJ) $(LIBNET_CONF_OBJ) $(PRIVILEGES_BASIC_OBJ)
PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
@@ -439,51 +439,47 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
#
UTIL_REG_OBJ = lib/util_reg.o
UTIL_REG_API_OBJ = lib/util_reg_api.o
+
REG_INIT_SMBCONF_OBJ = registry/reg_init_smbconf.o
+REG_INIT_FULL_OBJ = registry/reg_init_full.o
REGFIO_OBJ = registry/regfio.o
REGOBJS_OBJ = registry/reg_objects.o
-REGISTRY_BACKENDS = registry/reg_backend_printing.o \
- registry/reg_backend_db.o \
- registry/reg_backend_smbconf.o \
- registry/reg_backend_shares.o \
- registry/reg_backend_netlogon_params.o \
- registry/reg_backend_prod_options.o \
- registry/reg_backend_tcpip_params.o \
- registry/reg_backend_hkpt_params.o \
- registry/reg_backend_current_version.o \
- registry/reg_backend_perflib.o
-
-
-REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \
- registry/reg_eventlog.o \
- registry/reg_util.o registry/reg_perfcount.o \
- registry/reg_util_legacy.o \
- registry/reg_api.o \
+REG_BACKENDS_BASE_OBJ = registry/reg_backend_db.o
+
+REG_BACKENDS_SMBCONF_OBJ = registry/reg_backend_smbconf.o
+
+REG_BACKENDS_EXTRA_OBJ = registry/reg_backend_printing.o \
+ registry/reg_backend_shares.o \
+ registry/reg_backend_netlogon_params.o \
+ registry/reg_backend_prod_options.o \
+ registry/reg_backend_tcpip_params.o \
+ registry/reg_backend_hkpt_params.o \
+ registry/reg_backend_current_version.o \
+ registry/reg_backend_perflib.o
+
+REG_BASE_OBJ = registry/reg_api.o \
registry/reg_dispatcher.o \
- $(REGISTRY_BACKENDS) \
- $(UTIL_REG_API_OBJ) \
- $(REG_INIT_SMBCONF_OBJ) \
+ registry/reg_cachehook.o \
$(REGFIO_OBJ) \
- $(REGOBJS_OBJ)
-
-# objects to be used when not all of the registry code should be
-# loaded but only the portion needed by reg_api, typically for
-# using smbconf (registry) - full access
-REG_API_OBJ = registry/reg_api.o \
- registry/reg_dispatcher.o \
- registry/reg_backend_smbconf.o \
- registry/reg_backend_db.o \
- registry/reg_util.o \
- \
- registry/reg_cachehook.o \
- \
- lib/util_nttoken.o \
- $(UTIL_REG_API_OBJ) \
- $(REG_INIT_SMBCONF_OBJ) \
- $(REGFIO_OBJ)
+ $(REGOBJS_OBJ) \
+ registry/reg_util.o \
+ $(UTIL_REG_API_OBJ) \
+ lib/util_nttoken.o \
+ $(REG_BACKENDS_BASE_OBJ)
+
+REG_SMBCONF_OBJ = $(REG_BASE_OBJ) \
+ $(REG_BACKENDS_SMBCONF_OBJ) \
+ $(REG_INIT_SMBCONF_OBJ)
+
+REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
+ $(REG_BACKENDS_EXTRA_OBJ) \
+ $(REG_INIT_FULL_OBJ) \
+ registry/reg_eventlog.o \
+ registry/reg_perfcount.o \
+ registry/reg_util_legacy.o
RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
@@ -621,7 +617,6 @@ AUTH_WINBIND_OBJ = auth/auth_winbind.o
AUTH_SCRIPT_OBJ = auth/auth_script.o
AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
- lib/util_nttoken.o \
auth/auth_compat.o auth/auth_ntlmssp.o \
$(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ)
@@ -660,7 +655,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
- $(REGISTRY_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
+ $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
$(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@ \
$(PRIVILEGES_BASIC_OBJ)
@@ -798,12 +793,12 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
lib/netapi/getdc.o
LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
- $(REG_API_OBJ) \
+ $(REG_SMBCONF_OBJ) \
$(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
$(SECRETS_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DCUTIL_OBJ) $(LIBADS_OBJ) $(REGOBJS_OBJ) $(PRIVILEGES_BASIC_OBJ)
+ $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
LIBNET_CONF_OBJ = libnet/libnet_conf.o
@@ -829,8 +824,8 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
$(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
- $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
- $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ $(REGOBJS_OBJ) \
+ $(REG_SMBCONF_OBJ) $(DISPLAY_DSDCINFO_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
+ $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
$(PRIVILEGES_BASIC_OBJ)
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
@@ -940,7 +935,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
$(PRINTING_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) $(NOTIFY_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(READLINE_OBJ) $(PROFILE_OBJ) $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) \
- $(AUTH_SAM_OBJ) $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
+ $(AUTH_SAM_OBJ) $(REG_FULL_OBJ) $(POPT_LIB_OBJ) \
$(RPC_LSA_OBJ) $(RPC_NETLOG_OBJ) $(RPC_SAMR_OBJ) $(RPC_REG_OBJ) $(RPC_DSSETUP_OBJ) \
$(RPC_SVC_OBJ) $(RPC_WKS_OBJ) $(RPC_DFS_OBJ) $(RPC_SPOOLSS_OBJ) \
$(RPC_ECHO_OBJ) $(RPC_SVCCTL_OBJ) $(RPC_EVENTLOG_OBJ) $(SMBLDAP_OBJ) \
--
Samba Shared Repository
More information about the samba-cvs
mailing list