wafsamba: fix ordering problems with lib-provided and internal RPATHs

[obnox/samba/samba-obnox.git] / librpc / wscript_build

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 2017a291fc379b9c740f3419f0a6b58ea680e042..f598d74363731d7a43d9ee7906b7567574767806 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -65,6 +65,11 @@ bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSRPC',
+       source='gen_ndr/ndr_frsrpc_c.c',
+       public_deps='NDR_FRSRPC'
+       )
+
 bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
     source='gen_ndr/ndr_frsapi.c',
     public_deps='ndr'
@@ -80,6 +85,21 @@ bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_BKUPBLOBS',
+       source='ndr/ndr_bkupblobs.c gen_ndr/ndr_bkupblobs.c',
+       public_deps='ndr'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_FSCC',
+       source='gen_ndr/ndr_fscc.c',
+       public_deps='ndr'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSBLOBS',
+       source='gen_ndr/ndr_frsblobs.c',
+       public_deps='ndr'
+       )
+
 bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
     source='gen_ndr/ndr_policyagent.c',
     public_deps='ndr'
@@ -300,11 +320,16 @@ bld.SAMBA_SUBSYSTEM('NDR_FSRVP',
        public_deps='ndr'
        )
 
+bld.SAMBA_SUBSYSTEM('NDR_WITNESS',
+    source='gen_ndr/ndr_witness.c',
+    public_deps='ndr'
+    )
+
 bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
-    source='gen_ndr/ndr_dcerpc.c',
+    source='gen_ndr/ndr_dcerpc.c ndr/ndr_dcerpc.c',
     public_deps='ndr',
-    public_headers='gen_ndr/ndr_dcerpc.h gen_ndr/dcerpc.h',
-    header_path= [ ('*gen_ndr*', 'gen_ndr') ],
+    public_headers='gen_ndr/ndr_dcerpc.h gen_ndr/dcerpc.h ndr/ndr_dcerpc.h',
+    header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
     )
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
@@ -348,6 +373,12 @@ bld.SAMBA_SUBSYSTEM('NDR_XATTR',
     public_deps='ndr NDR_SECURITY'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_SMB2_LEASE_STRUCT',
+    source='gen_ndr/ndr_smb2_lease_struct.c',
+    public_deps='ndr',
+    public_headers='gen_ndr/smb2_lease_struct.h'
+    )
+
 bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
     source='ndr/ndr_schannel.c gen_ndr/ndr_schannel.c',
     public_deps='ndr ndr_nbt'
@@ -605,7 +636,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSSERVER',
     )
 
 bld.SAMBA_SUBSYSTEM('NDR_IOCTL',
-    source='gen_ndr/ndr_ioctl.c',
+    source='gen_ndr/ndr_ioctl.c ndr/ndr_ioctl.c',
     public_deps='ndr'
     )
 
@@ -614,12 +645,17 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_FSRVP',
        public_deps='dcerpc-binding NDR_FSRVP'
        )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WITNESS',
+    source='gen_ndr/ndr_witness_c.c',
+    public_deps='dcerpc-binding NDR_WITNESS'
+    )
+
 # a grouping library for NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('ndr-samba',
     source=[],
     deps='''NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT
     NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM
-    NDR_NTPRINTING NDR_FSRVP NDR_OPEN_FILES NDR_SMBXSRV''',
+    NDR_NTPRINTING NDR_FSRVP NDR_WITNESS NDR_OPEN_FILES NDR_SMBXSRV''',
     private_library=True,
     grouping_library=True
     )
@@ -642,7 +678,7 @@ bld.SAMBA_LIBRARY('ndr',
     public_deps='errors talloc samba-util',
     public_headers='gen_ndr/misc.h gen_ndr/ndr_misc.h ndr/libndr.h:ndr.h',
     header_path= [('*gen_ndr*', 'gen_ndr')],
-    vnum='0.0.2',
+    vnum='0.0.4',
     abi_directory='ABI',
     abi_match='ndr_* GUID_*',
     )
@@ -653,3 +689,18 @@ bld.SAMBA_LIBRARY('dcerpc-binding',
     pc_files=[],
     public_headers='rpc/rpc_common.h',
     vnum='0.0.1')
+
+bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
+       source='gen_ndr/ndr_winbind.c',
+       public_deps='ndr NDR_LSA'
+       )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
+       source='gen_ndr/ndr_winbind_c.c',
+       public_deps='dcerpc NDR_WINBIND'
+       )
+
+bld.SAMBA3_SUBSYSTEM('SRV_NDR_WINBIND',
+       source='gen_ndr/srv_winbind.c',
+       public_deps='NDR_WINBIND'
+       )