diff options
| author | Tim Potter <tpot@samba.org> | 2005-09-23 02:28:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:46 -0500 |
| commit | c715f7256a231cd8c561590c9830a813c6a4d15d (patch) | |
| tree | 63eb52afc519eb919062071d588b75f6f6159c43 /source4 | |
| parent | 7cf1f5768cdf679c85b98185bc650db673d6c803 (diff) | |
| download | samba-c715f7256a231cd8c561590c9830a813c6a4d15d.tar.gz samba-c715f7256a231cd8c561590c9830a813c6a4d15d.tar.bz2 samba-c715f7256a231cd8c561590c9830a813c6a4d15d.zip | |
r10442: Build librpc/libndr_misc.a from librpc/idl/misc.idl. Doesn't quite work
yet as scons somehow thinks it needs to put a directory called ndr_idl
in the command line.
(This used to be commit e4a54a4c49b958b56dc7822c800a3f5ff7eb0b60)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/scons/pidl.py | 6 | ||||
| -rw-r--r-- | source4/librpc/SConscript | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/scons/pidl.py b/source4/build/scons/pidl.py index c7d734a4fa..fbde72ddd5 100644 --- a/source4/build/scons/pidl.py +++ b/source4/build/scons/pidl.py @@ -12,8 +12,8 @@ idl_scanner = SCons.Scanner.ClassicCPP("PIDLScan", '.idl', 'CPPPATH', r'depends\ def idl_emitter(target, source, env): base, ext = SCons.Util.splitext(str(source[0])) - result = ['gen_ndr/%s.c' % base, 'gen_ndr/%s.h' % base] - return result + result = ['gen_ndr/ndr_%s.c' % base, 'gen_ndr/ndr_%s.h' % base] + return result, source pidl_builder = SCons.Builder.Builder(action='$PIDLCOM', emitter = idl_emitter, @@ -23,7 +23,7 @@ pidl_builder = SCons.Builder.Builder(action='$PIDLCOM', def generate(env): env['PIDL'] = env.Detect('pidl') or './pidl/pidl' - env['PIDLFLAGS'] = [] + env['PIDLFLAGS'] = ['--outputdir', 'librpc/gen_ndr', '--ndr-header', '--ndr-parser'] env['PIDLCOM'] = '$PIDL $PIDLFLAGS -- $SOURCE' env['BUILDERS']['NdrMarshaller'] = pidl_builder diff --git a/source4/librpc/SConscript b/source4/librpc/SConscript index 4de611dfc9..cf0d58245f 100644 --- a/source4/librpc/SConscript +++ b/source4/librpc/SConscript @@ -11,6 +11,8 @@ hostenv.StaticLibrary('rpc_base', 'rpc/dcerpc_util.c','rpc/dcerpc_error.c','rpc/dcerpc_smb.c', 'rpc/dcerpc_sock.c']) +ndr_misc = hostenv.NdrMarshaller('idl/misc.idl') +hostenv.StaticLibrary('ndr_misc', ndr_misc) ''' [SUBSYSTEM::NDR_AUDIOSRV] |