summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2009-03-24 09:39:18 +0000
committerpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2009-03-24 09:39:18 +0000
commitc1245d5ad1db525894f91263a514a844ed1a6a44 (patch)
treeefa9c41904f383c650c535a762fe7f0f00c0a738
parent862e0fa23df5d0a846ac95e15671150089bcd70f (diff)
downloadlibapr-c1245d5ad1db525894f91263a514a844ed1a6a44.tar.gz
SCons: ability to build in a variant build directory
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@757694 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--SConscript12
-rw-r--r--SConstruct10
2 files changed, 16 insertions, 6 deletions
diff --git a/SConscript b/SConscript
new file mode 100644
index 000000000..0518feccf
--- /dev/null
+++ b/SConscript
@@ -0,0 +1,12 @@
+
+Import("env")
+
+files = env.core_lib_files()
+
+(major, minor, patch) = env.APRVersion()
+
+libapr = env.SharedLibrary('apr-%d' % (major), files)
+
+targets = [libapr]
+
+Return("targets") \ No newline at end of file
diff --git a/SConstruct b/SConstruct
index c7253ad78..cdeb8b7ce 100644
--- a/SConstruct
+++ b/SConstruct
@@ -17,6 +17,7 @@ vars.Add(EnumVariable('pool_debug', 'Turn on pools debugging', 'no',
env = APREnv(args=ARGUMENTS, variables=vars)
+
Help(vars.GenerateHelpText(env))
env.APRHints()
@@ -40,12 +41,9 @@ if env['pool_debug'] != 'no':
'all': 31}
env.AppendUnique(CPPFLAGS = "-DAPR_POOL_DEBUG=%d" % flags[env['pool_debug']])
-files = env.core_lib_files()
-
-(major, minor, patch) = env.APRVersion()
-
-libapr = env.SharedLibrary('apr-%d' % (major), files)
+Export("env")
-targets = [libapr]
+# TODO: Support debug/release builds
+targets = SConscript("SConscript", variant_dir='builds/default', duplicate=0)
env.Default(targets)