summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-20 23:48:28 +0100
committerMichael Adam <obnox@samba.org>2008-01-21 08:49:12 +0100
commit625c17e67025e6af319ac05b0b406208a91d4fea (patch)
treefcda9de67a4b8bd534d95e148e14425f796333a6 /source3
parent8f290dccc967f00b55e8c8a115dc804c2464ba67 (diff)
downloadsamba-625c17e67025e6af319ac05b0b406208a91d4fea.tar.gz
samba-625c17e67025e6af319ac05b0b406208a91d4fea.tar.bz2
samba-625c17e67025e6af319ac05b0b406208a91d4fea.zip
Makefile.in: Group together registry related object variables.
Michael (This used to be commit cf485273f61e3dcd41ab7af756cc82f32131bf08)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in47
1 files changed, 25 insertions, 22 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 76480b950f..0932997f1a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -411,6 +411,15 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
$(LIBNDR_GEN_OBJ) \
$(RPCCLIENT_NDR_OBJ)
+#
+# registry-related objects
+#
+UTIL_REG_OBJ = lib/util_reg.o
+UTIL_REG_API_OBJ = lib/util_reg_api.o
+UTIL_REG_SMBCONF_OBJ = lib/util_reg_smbconf.o
+
+REGFIO_OBJ = registry/regfio.o
+
REGOBJS_OBJ = registry/reg_objects.o
REGISTRY_BACKENDS = registry/reg_printing.o \
@@ -433,6 +442,22 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \
$(REGISTRY_BACKENDS) \
$(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_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_frontend_hilvl.o \
+ registry/reg_smbconf.o \
+ registry/reg_db.o \
+ registry/reg_util.o \
+ \
+ registry/reg_cachehook.o \
+ \
+ lib/util_nttoken.o \
+ $(UTIL_REG_API_OBJ) \
+ $(UTIL_REG_SMBCONF_OBJ)
+
+
RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o
@@ -440,8 +465,6 @@ RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o
RPC_SAMR_OBJ = rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \
rpc_server/srv_samr_util.o
-REGFIO_OBJ = registry/regfio.o
-
RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
RPC_REG_OBJ = rpc_server/srv_winreg_nt.o \
@@ -732,26 +755,6 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
$(DISPLAY_SEC_OBJ)
-UTIL_REG_OBJ = lib/util_reg.o
-UTIL_REG_API_OBJ = lib/util_reg_api.o
-UTIL_REG_SMBCONF_OBJ = lib/util_reg_smbconf.o
-
-# 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_frontend_hilvl.o \
- registry/reg_smbconf.o \
- registry/reg_db.o \
- registry/reg_util.o \
- \
- registry/reg_cachehook.o \
- \
- lib/util_nttoken.o \
- $(UTIL_REG_API_OBJ) \
- $(UTIL_REG_SMBCONF_OBJ)
-
-
LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
lib/netapi/joindomain.o \
lib/netapi/serverinfo.o \