diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-17 16:29:28 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
| commit | cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf (patch) | |
| tree | e11a79f20fc7d07a438605ca0f6b390a2a9ccacc | |
| parent | 177ddcb084e8f8608bf2012a7c58f7b1e56d2acd (diff) | |
| download | samba-cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf.tar.gz samba-cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf.tar.bz2 samba-cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf.zip | |
librpc make ndr-standard a common library
| -rw-r--r-- | librpc/wscript_build | 11 | ||||
| -rw-r--r-- | source3/wscript_build | 10 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 13 |
3 files changed, 11 insertions, 23 deletions
diff --git a/librpc/wscript_build b/librpc/wscript_build index 11b49ae419..abbda8cfe3 100644 --- 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 8f995ee490..7152273ee3 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -999,16 +999,6 @@ bld.SAMBA3_SUBSYSTEM('samba-util', 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') bld.SAMBA3_SUBSYSTEM('ldb', diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index cecafa8d66..983f11a08c 100755 --- 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=[], |