waf: Remove lib prefix from libraries manually.

1 files changed, 55 insertions, 55 deletions

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 6e73a3d971b..2ff4c3e58f8 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -4,82 +4,82 @@ bld.RECURSE('idl')
 
 bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
 	source='../librpc/gen_ndr/ndr_audiosrv.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
 	source='../librpc/gen_ndr/ndr_named_pipe_auth.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
 	source='../librpc/gen_ndr/ndr_dnsserver.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DNS',
 	source='../librpc/gen_ndr/ndr_dns.c ../librpc/ndr/ndr_dns.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
 	source='../librpc/gen_ndr/ndr_dsbackup.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DFS',
 	source='../librpc/gen_ndr/ndr_dfs.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_WINREG',
 	source='../librpc/gen_ndr/ndr_winreg.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_LSA'
+	public_deps='ndr NDR_SECURITY NDR_LSA'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_EFS',
 	source='../librpc/gen_ndr/ndr_efs.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_ROT',
 	source='../librpc/gen_ndr/ndr_rot.c',
-	public_deps='LIBNDR NDR_ORPC'
+	public_deps='ndr NDR_ORPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
 	source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
 	source='../librpc/gen_ndr/ndr_frsapi.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
 	source='../librpc/gen_ndr/ndr_frstrans.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
 	source='../librpc/gen_ndr/ndr_dfsblobs.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
 	source='../librpc/gen_ndr/ndr_policyagent.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
 	source='../librpc/gen_ndr/ndr_unixinfo.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
 	source='../librpc/gen_ndr/ndr_spoolss.c',
-	public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY'
+	public_deps='ndr NDR_SPOOLSS_BUF NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
@@ -89,199 +89,199 @@ bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
 
 bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
 	source='../librpc/gen_ndr/ndr_epmapper.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
 	source='../librpc/gen_ndr/ndr_dbgidl.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
 	source='../librpc/gen_ndr/ndr_dssetup.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
 	source='../librpc/gen_ndr/ndr_msgsvc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_MGMT',
 	source='../librpc/gen_ndr/ndr_mgmt.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
 	source='../librpc/gen_ndr/ndr_protected_storage.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_ORPC',
 	source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
 	source='../librpc/gen_ndr/ndr_oxidresolver.c',
-	public_deps='LIBNDR NDR_ORPC'
+	public_deps='ndr NDR_ORPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_REMACT',
 	source='../librpc/gen_ndr/ndr_remact.c',
-	public_deps='LIBNDR NDR_ORPC'
+	public_deps='ndr NDR_ORPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DCOM',
 	source='../librpc/gen_ndr/ndr_dcom.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_ORPC'
+	public_deps='ndr NDR_SECURITY NDR_ORPC'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_WMI',
 	source='../librpc/ndr/ndr_wmi.c ../librpc/gen_ndr/ndr_wmi.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_DCOM'
+	public_deps='ndr NDR_SECURITY NDR_DCOM'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
 	source='../librpc/gen_ndr/ndr_wzcsvc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
 	source='../librpc/gen_ndr/ndr_browser.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
 	source='../librpc/gen_ndr/ndr_w32time.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
 	source='../librpc/gen_ndr/ndr_scerpc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
 	source='../librpc/gen_ndr/ndr_trkwks.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
 	source='../librpc/gen_ndr/ndr_keysvc.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_RAP',
 	source='../librpc/gen_ndr/ndr_rap.c ../librpc/ndr/ndr_rap.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
 	source='../librpc/gen_ndr/ndr_idmap.c',
-	public_deps='LIBNDR NDR_STANDARD'
+	public_deps='ndr NDR_STANDARD'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
 	source='../librpc/ndr/ndr_ntlmssp.c ../librpc/gen_ndr/ndr_ntlmssp.c',
-	public_deps='LIBNDR NDR_STANDARD'
+	public_deps='ndr NDR_STANDARD'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DNSP',
 	source='../librpc/gen_ndr/ndr_dnsp.c ../librpc/ndr/ndr_dnsp.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
 	source='../librpc/gen_ndr/ndr_ntprinting.c ../librpc/ndr/ndr_ntprinting.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SAMR',
 	source='../librpc/gen_ndr/ndr_samr.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_LSA'
+	public_deps='ndr NDR_SECURITY NDR_LSA'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_LSA',
 	source='../librpc/gen_ndr/ndr_lsa.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SVCCTL',
 	source='../librpc/gen_ndr/ndr_svcctl.c ../librpc/ndr/ndr_svcctl.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
 	source='../librpc/gen_ndr/ndr_srvsvc.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_SVCCTL'
+	public_deps='ndr NDR_SECURITY NDR_SVCCTL'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
 	source='../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
+	public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
 	source='../librpc/gen_ndr/ndr_eventlog.c',
-	public_deps='LIBNDR NDR_SECURITY NDR_LSA'
+	public_deps='ndr NDR_SECURITY NDR_LSA'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NTSVCS',
 	source='../librpc/gen_ndr/ndr_ntsvcs.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_WKSSVC',
 	source='../librpc/gen_ndr/ndr_wkssvc.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_ECHO',
 	source='../librpc/gen_ndr/ndr_echo.c',
-	public_deps='LIBNDR'
+	public_deps='ndr'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
 	source='../librpc/gen_ndr/ndr_initshutdown.c',
-	public_deps='LIBNDR NDR_LSA'
+	public_deps='ndr NDR_LSA'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
 	source='../librpc/ndr/ndr_compression.c',
-	public_deps='errors LIBNDR',
+	public_deps='errors ndr',
 	deps='ZLIB LZXPRESS'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
 	source='../librpc/ndr/ndr_drsuapi.c ../librpc/gen_ndr/ndr_drsuapi.c',
-	public_deps='LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL'
+	public_deps='ndr NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
 	source='../librpc/ndr/ndr_drsblobs.c ../librpc/gen_ndr/ndr_drsblobs.c',
-	public_deps='LIBNDR NDR_DRSUAPI'
+	public_deps='ndr NDR_DRSUAPI'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
 	source='../librpc/ndr/ndr_krb5pac.c ../librpc/gen_ndr/ndr_krb5pac.c',
-	public_deps='LIBNDR NDR_STANDARD NDR_SECURITY'
+	public_deps='ndr NDR_STANDARD NDR_SECURITY'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('NDR_XATTR',
 	source='../librpc/ndr/ndr_xattr.c ../librpc/gen_ndr/ndr_xattr.c',
-	public_deps='LIBNDR NDR_SECURITY'
+	public_deps='ndr NDR_SECURITY'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 	source='../librpc/ndr/ndr_schannel.c ../librpc/gen_ndr/ndr_schannel.c',
-	public_deps='LIBNDR NDR_NBT'
+	public_deps='ndr NDR_NBT'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NBT',
 	source='../librpc/gen_ndr/ndr_nbt.c',
-	public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
+	public_deps='ndr NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
 	public_headers='../librpc/gen_ndr/nbt.h',
         header_path='gen_ndr'
 	)