build: Move NDR_DSSETUP and NDR_SPOOLSS into ndr-standard

This is to address multiple defintion of symbol issues in msrpc3
linked libraries.

Andrew Bartlett

diff --git a/librpc/wscript_build b/librpc/wscript_build
index d6f0f6dd41c5c704fafff6f16ccebd39c8f0d2b8..a180c38af805fe36234bcaf208b84737c87c4d09 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -305,7 +305,7 @@ bld.SAMBA_LIBRARY('ndr-standard',
        pc_files='ndr_standard.pc',
        deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
        NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
-       NDR_ECHO security NDR_DNS NDR_ATSVC''',
+       NDR_ECHO security NDR_DNS NDR_ATSVC NDR_SPOOLSS NDR_DSSETUP''',
        public_deps='ndr',
        public_headers='gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/lsa.h gen_ndr/netlogon.h gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h',
        header_path='gen_ndr'