s4:s3compat Merge waf build changes for registry from s3 waf build.

(original patch by Michael Adam <obnox@samba.org>)

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 225770f3d127cb139837d9cd8398783810ee997c..833f0f8ea31b6aeed28b02667ce8b35644ece7c3 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -274,7 +274,7 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
 # registry-related objects
 #
 UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
-UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
+REG_UTIL_MARSHALLING_OBJ = '''registry/reg_util_marshalling.c'''
 
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
@@ -302,15 +302,16 @@ REG_BASE_SRC = '''registry/reg_api.c
                registry/reg_cachehook.c
                ${REGFIO_SRC}
                ${REGSRCS_SRC}
-               registry/reg_util.c
-               ${UTIL_REG_API_SRC}
+               registry/reg_util_internal.c
+              ${REG_UTIL_MARSHALLING_OBJ}
                lib/util_nttoken.c
                ${REG_BACKENDS_BASE_SRC}
                ${REG_INIT_BASIC_SRC}'''
 
 REG_SMBCONF_SRC = '''${REG_BASE_SRC}
                   ${REG_BACKENDS_SMBCONF_SRC}
-                  ${REG_INIT_SMBCONF_SRC}'''
+                  ${REG_INIT_SMBCONF_SRC}
+                 registry/reg_util_token.c'''
 
 REG_FULL_SRC = '''${REG_SMBCONF_SRC}
                ${REG_BACKENDS_EXTRA_SRC}