diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-28 18:18:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:08 -0500 |
| commit | 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed (patch) | |
| tree | 008fb92b76381b2070568a27b905ff64608cb2b0 /source4/SConstruct | |
| parent | 09ee7a470ba052d184f94336cd7635efca387ace (diff) | |
| download | samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.gz samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.bz2 samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.zip | |
r10586: Add MergedObject() builder. Default to Library() rather
then StaticLibrary()
(This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1)
Diffstat (limited to 'source4/SConstruct')
| -rw-r--r-- | source4/SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/SConstruct b/source4/SConstruct index 297147fbe3..4fd59b7d50 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -24,7 +24,7 @@ opts.AddOptions( hostenv = Environment( toolpath=['build/scons','.'], - tools=['default','pidl','proto','et','asn1'], + tools=['default','pidl','proto','et','asn1','samba'], options=opts, CPPPATH=['#include','#','#lib'], CPPDEFINES={'_SAMBA_BUILD_': None}, |