summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-01-25 02:01:56 +0100
committerGünther Deschner <gd@samba.org>2011-01-25 11:42:46 +0100
commitdd35fe181c2397a970fa956afa5f4da534841b99 (patch)
tree0f40699c1134710641e94a616ecefa8aed36ea02 /source3
parent7eac3100ea77eca64152444336180418938d5843 (diff)
downloadsamba-dd35fe181c2397a970fa956afa5f4da534841b99.tar.gz
samba-dd35fe181c2397a970fa956afa5f4da534841b99.tar.bz2
samba-dd35fe181c2397a970fa956afa5f4da534841b99.zip
waf: share libndr.so between samba3 and samba4.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript_build14
1 files changed, 4 insertions, 10 deletions
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())