diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-25 02:01:56 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-25 11:42:46 +0100 |
| commit | dd35fe181c2397a970fa956afa5f4da534841b99 (patch) | |
| tree | 0f40699c1134710641e94a616ecefa8aed36ea02 | |
| parent | 7eac3100ea77eca64152444336180418938d5843 (diff) | |
| download | samba-dd35fe181c2397a970fa956afa5f4da534841b99.tar.gz samba-dd35fe181c2397a970fa956afa5f4da534841b99.tar.bz2 samba-dd35fe181c2397a970fa956afa5f4da534841b99.zip | |
waf: share libndr.so between samba3 and samba4.
Guenther
| -rw-r--r-- | librpc/wscript_build | 10 | ||||
| -rw-r--r-- | source3/wscript_build | 14 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 11 |
3 files changed, 14 insertions, 21 deletions
diff --git a/librpc/wscript_build b/librpc/wscript_build index 236a728d5f..9cbd9fa37c 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -493,3 +493,13 @@ bld.SAMBA_LIBRARY('dcerpc-samba', private_library=True, grouping_library=True ) + +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 samba-util', + 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', + vnum='0.0.1' + ) diff --git a/source3/wscript_build b/source3/wscript_build index 46eb90f5f8..3e5876c8da 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -34,13 +34,7 @@ COMPRESSION_SRC = '../lib/compression/mszip.c' DRSUAPI_SRC = '''${COMPRESSION_SRC}''' -LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c - ../librpc/ndr/ndr.c - ../librpc/ndr/ndr_misc.c - ../librpc/gen_ndr/ndr_misc.c - ../librpc/ndr/ndr_string.c - ../librpc/ndr/uuid.c - librpc/ndr/util.c''' +LIBNDR_SRC = '''librpc/ndr/util.c''' LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c rpc_client/init_spoolss.c''' @@ -759,7 +753,7 @@ if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): bld.SAMBA_SUBSYSTEM('LIBMSRPC', source='${LIBMSRPC_SRC}', - deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL + deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''', vars=locals()) @@ -845,7 +839,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT', bld.SAMBA_SUBSYSTEM('LIBS', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION', vars=locals()) bld.SAMBA_SUBSYSTEM('LIB_NONSMBD', @@ -1025,7 +1019,7 @@ bld.SAMBA_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('ndr', +bld.SAMBA_SUBSYSTEM('ndr-util', source=LIBNDR_SRC, vars=locals()) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 5cff4a9b68..4e2b6728cd 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -3,17 +3,6 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('idl') -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 samba-util', - 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', - vnum='0.0.1' - ) - - bld.SAMBA_BINARY('ndrdump', source='../../librpc/tools/ndrdump.c', manpages='../../librpc/tools/ndrdump.1', |