librpc make ndr-standard a common library

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 11b49ae419ec423d69b20e13713ae51eafdceaca..abbda8cfe3f85a3246f334efad7e5638b230c6b4 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -289,6 +289,17 @@ bld.SAMBA_LIBRARY('ndr-krb5pac',
                     vnum='0.0.1'
                     )
 
+bld.SAMBA_LIBRARY('ndr-standard',
+       source='gen_ndr/ndr_atsvc.c gen_ndr/ndr_eventlog6.c',
+       vnum='0.0.1',
+       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''',
+       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'
+       )
 
 bld.SAMBA_SUBSYSTEM('NDR_XATTR',
        source='ndr/ndr_xattr.c gen_ndr/ndr_xattr.c',

diff --git a/source3/wscript_build b/source3/wscript_build
index 8f995ee490be7f7fd170c09e8a745fb6d49d7c63..7152273ee359098f1545a051a654c743e5a3fc62 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -998,16 +998,6 @@ bld.SAMBA3_SUBSYSTEM('samba-util',
                     deps='talloc CHARSET LIBCRYPTO',
                     vars=locals())
 
-#FIXME
-bld.SAMBA3_SUBSYSTEM('ndr-standard',
-                    source='',
-                    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
-                    ''',
-                    vars=locals())
-
 #FIXME
 bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index cecafa8d66d0531c3ebf16b6450dd48ff492715b..983f11a08cbe4e6fef417db1277fc58b55a1891f 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -73,19 +73,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
        public_deps='NDR_IDMAP ndr ndr-standard'
        )
 
-
-bld.SAMBA_LIBRARY('ndr-standard',
-       source='../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_eventlog6.c',
-       vnum='0.0.1',
-       pc_files='../../librpc/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''',
-       public_deps='ndr',
-       public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
-       header_path='gen_ndr'
-       )
-
 # create a grouping library to consolidate our samba4 specific NDR code
 bld.SAMBA_LIBRARY('ndr-samba4',
        source=[],