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 a94ff8dac4ff1b418b6911ed9d886485017fe982..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'
@@ -217,6 +237,11 @@ bld.SAMBA_SUBSYSTEM('NDR_DNSP',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
+    source='gen_ndr/ndr_nfs4acl.c',
+    public_deps='ndr NDR_SECURITY'
+    )
+
 bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
     source='gen_ndr/ndr_ntprinting.c ndr/ndr_ntprinting.c',
     public_deps='ndr'
@@ -234,11 +259,16 @@ bld.SAMBA_SUBSYSTEM('NDR_LSA',
 
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
     source='gen_ndr/ndr_security.c ndr/ndr_sec_helper.c',
-    deps='ndr security',
+    deps='ndr samba-security',
     public_headers='gen_ndr/security.h',
     header_path='gen_ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_SMB_ACL',
+    source='gen_ndr/ndr_smb_acl.c',
+    deps='ndr',
+    )
+
 bld.SAMBA_SUBSYSTEM('NDR_SVCCTL',
     source='gen_ndr/ndr_svcctl.c ndr/ndr_svcctl.c',
     public_deps='ndr NDR_SECURITY'
@@ -285,11 +315,21 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
     deps='z LZXPRESS'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_FSRVP',
+       source='gen_ndr/ndr_fsrvp.c',
+       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',
@@ -333,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'
@@ -367,6 +413,16 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
     public_deps='NDR_XATTR dcerpc-binding'
     )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_IDMAP',
+    source='gen_ndr/ndr_idmap_c.c',
+    public_deps='NDR_IDMAP dcerpc-binding'
+    )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SMB_ACL',
+    source='gen_ndr/ndr_smb_acl_c.c',
+    public_deps='NDR_SMB_ACL dcerpc-binding'
+    )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
     source='gen_ndr/ndr_rot_c.c',
     public_deps='NDR_ROT dcerpc-binding'
@@ -539,6 +595,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
     public_deps='dcerpc-binding NDR_SCERPC'
     )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SERVER_ID',
+    source='gen_ndr/ndr_server_id_c.c',
+    public_deps='dcerpc-binding NDR_SERVER_ID'
+    )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
     source='gen_ndr/ndr_ntsvcs_c.c',
     public_deps='dcerpc-binding ndr-standard'
@@ -575,16 +636,26 @@ 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'
     )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_FSRVP',
+       source='gen_ndr/ndr_fsrvp_c.c',
+       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_NTPRINTING NDR_FSRVP NDR_WITNESS NDR_OPEN_FILES NDR_SMBXSRV''',
     private_library=True,
     grouping_library=True
     )
@@ -607,8 +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')],
-    depends_on='PIDL_MISC',
-    vnum='0.0.1',
+    vnum='0.0.4',
     abi_directory='ABI',
     abi_match='ndr_* GUID_*',
     )
@@ -619,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'
+       )