diff options
| author | Tim Potter <tpot@samba.org> | 2005-09-19 21:37:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:28 -0500 |
| commit | 3e1ae5a40929abfd3052991624b32605d0195fd1 (patch) | |
| tree | 32f9be5ae496a269d7aa4ec1f73c6f429e892bb9 | |
| parent | 523034b9fbc1841ed63137e3d8965d52997af4e6 (diff) | |
| download | samba-3e1ae5a40929abfd3052991624b32605d0195fd1.tar.gz samba-3e1ae5a40929abfd3052991624b32605d0195fd1.tar.bz2 samba-3e1ae5a40929abfd3052991624b32605d0195fd1.zip | |
r10327: Use CPPPATH instead of appending -Idir to CCFLAGS.
Use a list comprehension instead of a for loop.
Add a emacs thingy to kick in python mode. (-:
(This used to be commit 80bf842f56c0b0e632f32c8442ad62ebe7a87c8c)
| -rw-r--r-- | source4/SConstruct | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/source4/SConstruct b/source4/SConstruct index 3c8a54e04a..1022b19f51 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -1,9 +1,17 @@ +# tastes like -*- python -*- + # This is the experimental scons build script for Samba 4. For a proper # build use the old build system (configure + make). scons will # eventually replace this system. -hostenv = Environment(CCFLAGS='-Iinclude -I. -Ilib ') -hostenv.Append(CCFLAGS=' -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/hdb -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/des -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/com_err') +hostenv = Environment(CPPPATH = ['#', '#include', '#lib']) + +hostenv.Append(CPPPATH = ['#heimdal_build', '#heimdal/lib/krb5', + '#heimdal/lib/hdb', '#heimdal/lib/gssapi', + '#heimdal/lib/asn1', '#heimdal/lib/des', + '#heimdal/kdc', '#heimdal/lib/roken', + '#heimdal/lib/com_err']) + buildenv = hostenv.Copy() SConscript('param/SConscript','hostenv') @@ -12,23 +20,22 @@ SConscript('lib/SConscript','hostenv') dynenv = hostenv.Copy() paths = { - 'BINDIR': "bin", - 'SBINDIR': "sbin", - 'CONFIGFILE': "cfg", - 'LOGFILEBASE': "lfb", - 'NCALRPCDIR': "ncalrpc", - 'LMHOSTSFILE': "lmhosts", - 'LIBDIR': "libdir", - 'SHLIBEXT': "ext", - 'LOCKDIR': "lockdir", - 'PIDDIR': "piddir", - 'SMB_PASSWD_FILE': "smbpasswd", + 'BINDIR': 'bin', + 'SBINDIR': 'sbin', + 'CONFIGFILE': 'cfg', + 'LOGFILEBASE': 'lfb', + 'NCALRPCDIR': 'ncalrpc', + 'LMHOSTSFILE': 'lmhosts', + 'LIBDIR': 'libdir', + 'SHLIBEXT': 'ext', + 'LOCKDIR': 'lockdir', + 'PIDDIR': 'piddir', + 'SMB_PASSWD_FILE': 'smbpasswd', 'PRIVATE_DIR': 'private', - 'SWATDIR': "swat" + 'SWATDIR': 'swat' } -for i in paths: - dynenv.Append(CCFLAGS=' -D'+i+'=\\"'+paths[i]+'\\"') +[dynenv.Append(CPPDEFINES = {p: '\\"%s\\"' % paths[p]}) for p in paths] dynconfig = dynenv.Object('dynconfig.c') Export('dynconfig') |