--- ray/SConstruct 2004/10/21 15:47:11 1.4 +++ ray/SConstruct 2008/12/23 15:03:58 1.7 @@ -4,7 +4,6 @@ import sys import string OPTFILE = 'rayopts.py' -SourceSignatures('timestamp') def set_opts(env): # XXX add some caching opts = Options(OPTFILE, ARGUMENTS) @@ -26,7 +25,7 @@ def allplats_setup(env): from build_utils import find_libs find_libs.find_x11(env) find_libs.find_gl(env) # OpenGL - #find_libs.find_pixar(env) # PIXAR_LIB for src/px/ra_pixar.c + find_libs.find_libtiff(env) def post_common_setup(env): env.Append(CPPPATH = [os.path.join('#src', 'common')]) @@ -44,6 +43,7 @@ def shareinstall_setup(env): # Set up build environment env = Environment() +env.Decider('timestamp-match') if os.name == 'posix': from build_utils import install @@ -79,6 +79,8 @@ for d in Split('meta cv gen ot rt px hd util cal'): if string.find(string.join(sys.argv[1:]), 'install') > -1: shareinstall_setup(env) +Default('.') + # virtual targets env.Alias('bininstall', '$RAD_BINDIR') env.Alias('rlibinstall', '$RAD_RLIBDIR') @@ -87,13 +89,4 @@ env.Alias('maninstall', '$RAD_MANDIR') env.Alias('build', ['#bin']) env.Alias('test', ['#src/test']) env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall']) - -# Further virtual targets are defined locally: -# meta_special: mt1601 okimate imagew mt160 mx80 impress aed5 -# tcurve tscat tbar mtext libt4014.a plotout t4014 -# px_special: ra_im, t4027, paintjet, mt160t, greyscale, colorscale, d48c -# util_special: scanner, makedist (not for Windows yet) -env.Alias('special', ['meta_special', 'px_special', 'util_special']) -env.Alias('special_install', ['meta_special_install', - 'px_special_install', 'util_special_install'])