svn commit: samba r10327 - in branches/SAMBA_4_0/source: .

tpot at samba.org tpot at samba.org
Mon Sep 19 21:37:39 GMT 2005


Author: tpot
Date: 2005-09-19 21:37:38 +0000 (Mon, 19 Sep 2005)
New Revision: 10327

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10327

Log:
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.  (-:

Modified:
   branches/SAMBA_4_0/source/SConstruct


Changeset:
Modified: branches/SAMBA_4_0/source/SConstruct
===================================================================
--- branches/SAMBA_4_0/source/SConstruct	2005-09-19 21:26:11 UTC (rev 10326)
+++ branches/SAMBA_4_0/source/SConstruct	2005-09-19 21:37:38 UTC (rev 10327)
@@ -1,3 +1,5 @@
+#            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.
@@ -2,4 +4,10 @@
 
-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()
@@ -12,23 +20,22 @@
 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')



More information about the samba-cvs mailing list