s3-waf: let winbind depend on SRV_NDR_WBINT and RPCCLI_NDR_WBINT.

Guenther

diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 4414ca27fa1ec6b999de086ad58bef8a37ad8673..269c94d225c5b66c228b1b139d7c200031ddd05c 100644 (file)
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -34,3 +34,13 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT',
        source='../librpc/gen_ndr/ndr_wbint_c.c',
        public_deps='dcerpc NDR_WBINT'
        )
+
+bld.SAMBA_SUBSYSTEM('RPCCLI_NDR_WBINT',
+       source='../librpc/gen_ndr/cli_wbint.c',
+       public_deps='RPC_NDR_WBINT'
+       )
+
+bld.SAMBA_SUBSYSTEM('SRV_NDR_WBINT',
+       source='../librpc/gen_ndr/srv_wbint.c',
+       public_deps='NDR_WBINT'
+       )

diff --git a/source3/wscript_build b/source3/wscript_build
index 7e233d22b2682f75dfa881c7635fa41923777db6..2458c8f046a2fcb1175fddc662ff6e22152660d1 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -637,10 +637,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_dual.c
                    winbindd/winbindd_dual_ndr.c
                    winbindd/winbindd_dual_srv.c
-                   librpc/gen_ndr/cli_wbint.c
-                   librpc/gen_ndr/srv_wbint.c
-                   librpc/gen_ndr/ndr_wbint.c
-                   librpc/gen_ndr/ndr_wbint_c.c
                    winbindd/winbindd_async.c
                    winbindd/winbindd_creds.c
                    winbindd/winbindd_cred_cache.c
@@ -1400,7 +1396,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
                  libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
-                 NSS_INFO_TEMPLATE
+                 NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',