From 8cf61377aa388724150699618f5cd60682ffde37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 24 Oct 2010 10:42:58 -0700 Subject: waf: Remove lib prefix from libraries manually. --- source4/librpc/wscript_build | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index d100dd3f9d..261633ba89 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -3,10 +3,10 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('idl') -bld.SAMBA_LIBRARY('LIBNDR', +bld.SAMBA_LIBRARY('ndr', source='../../librpc/ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c', pc_files='../../librpc/ndr.pc', - public_deps='errors talloc libsamba-util CHARSET', + public_deps='errors talloc samba-util CHARSET', public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h', header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ], depends_on='PIDL_MISC', @@ -17,14 +17,14 @@ bld.SAMBA_LIBRARY('LIBNDR', bld.SAMBA_BINARY('ndrdump', source='../../librpc/tools/ndrdump.c', manpages='../../librpc/tools/ndrdump.1', - deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA ndr_table errors' + deps='samba-hostconfig samba-util popt POPT_SAMBA ndr_table errors' ) bld.SAMBA_SUBSYSTEM('NDR_SECURITY', source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c', - public_deps='LIBNDR', + public_deps='ndr', public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h', header_path='gen_ndr' ) @@ -32,63 +32,63 @@ bld.SAMBA_SUBSYSTEM('NDR_SECURITY', bld.SAMBA_SUBSYSTEM('NDR_WINSTATION', source='gen_ndr/ndr_winstation.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_IRPC', source='gen_ndr/ndr_irpc.c', - public_deps='LIBNDR NDR_SECURITY NDR_NBT' + public_deps='ndr NDR_SECURITY NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS', source='gen_ndr/ndr_sasl_helpers.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL', source='gen_ndr/ndr_nfs4acl.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_WINSIF', source='gen_ndr/ndr_winsif.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_OPENDB', source='gen_ndr/ndr_opendb.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_s4_notify.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND', source='gen_ndr/ndr_ntp_signd.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WINSREPL', source='gen_ndr/ndr_winsrepl.c', - public_deps='LIBNDR NDR_NBT' + public_deps='ndr NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_WINBIND', source='gen_ndr/ndr_winbind.c', - public_deps='NDR_IDMAP LIBNDR NDR_STANDARD' + public_deps='NDR_IDMAP ndr NDR_STANDARD' ) @@ -99,7 +99,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD', 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='LIBNDR', + 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' ) @@ -173,7 +173,7 @@ bld.SAMBA_LIBRARY('dcerpc_atsvc', vnum='0.0.1', public_deps='dcerpc NDR_STANDARD', public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h', - header_path='gen_ndr' + header_path='gen_ndr' ) @@ -185,9 +185,9 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF', bld.SAMBA_SUBSYSTEM('NDR_DCERPC', source='../../librpc/gen_ndr/ndr_dcerpc.c', - public_deps='LIBNDR', + public_deps='ndr', public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h ../../librpc/gen_ndr/dcerpc.h', - header_path= [ ('*gen_ndr*', 'gen_ndr') ], + header_path= [ ('*gen_ndr*', 'gen_ndr') ], ) bld.SAMBA_LIBRARY('dcerpc', @@ -197,24 +197,24 @@ bld.SAMBA_LIBRARY('dcerpc', ../../librpc/rpc/dcerpc_error.c ../../librpc/rpc/dcerpc_util.c ../../librpc/rpc/binding_handle.c''', pc_files='dcerpc.pc', - deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', + deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', public_deps='CREDENTIALS tevent talloc', public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', - header_path='gen_ndr', + header_path='gen_ndr', vnum='0.0.1' ) bld.SAMBA_SUBSYSTEM('pyrpc_util', - source='rpc/pyrpc_util.c', - public_deps='PYTALLOC pyparam_util dcerpc', - pyext=True, - ) + source='rpc/pyrpc_util.c', + public_deps='PYTALLOC pyparam_util dcerpc', + pyext=True, + ) bld.SAMBA_PYTHON('python_dcerpc', source='rpc/pyrpc.c', - public_deps='LIBCLI_SMB libsamba-util libsamba-hostconfig dcerpc_samr RPC_NDR_LSA DYNCONFIG pyrpc_util', + public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc_samr RPC_NDR_LSA DYNCONFIG pyrpc_util', realname='samba/dcerpc/base.so' ) -- cgit