Makefile.in: Group together registry related object variables.

Michael
(This used to be commit cf485273f61e3dcd41ab7af756cc82f32131bf08)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 76480b950fcc446c475c7124776c343f3a2d526d..0932997f1a29ec1ba5abe3dc6d7f7ad5b4f07b0c 100644 (file)
--- 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 \