diff --git a/Cantera/src/SConscript b/Cantera/src/SConscript index ba13ad7e9..7d557761e 100644 --- a/Cantera/src/SConscript +++ b/Cantera/src/SConscript @@ -18,8 +18,12 @@ libs = [('base', 'ctbase', ['cpp']), for subdir, libname, extensions in libs: for header in mglob(localenv, subdir, 'h'): - env.Command('../include/cantera/kernel/%s' % header.name, header, - Copy('$TARGET', '$SOURCE')) + h = localenv.Command('../include/cantera/kernel/%s' % header.name, header, + Copy('$TARGET', '$SOURCE')) + buildTargets.extend(h) + inst = localenv.Install(pjoin('$ct_incdir', 'kernel'), h) + installTargets.extend(inst) + lib = localenv.Library(pjoin('../lib', libname), source=mglob(localenv, subdir, *extensions)) inst = localenv.Install('$ct_libdir', lib) diff --git a/SConstruct b/SConstruct index 3884076b5..aa5731ee0 100644 --- a/SConstruct +++ b/SConstruct @@ -242,21 +242,12 @@ env['ct_mandir'] = pjoin(env['prefix']) # *** Build Cantera *** # ********************* -# Put headers in place -for header in mglob(env, 'Cantera/cxx/include', 'h'): - env.Command('build/include/cantera/%s' % header.name, header, - Copy('$TARGET', '$SOURCE')) - -for header in mglob(env, 'Cantera/clib/src', 'h'): - env.Command('build/include/cantera/clib/%s' % header.name, header, - Copy('$TARGET', '$SOURCE')) - -env.Command('build/include/cantera/config.h', 'config.h', Copy('$TARGET', '$SOURCE')) - buildDir = 'build' buildTargets = [] installTargets = [] + env.SConsignFile() + env.Append(CPPPATH=[Dir(os.getcwd()), Dir('build/include/cantera/kernel'), Dir('build/include/cantera'), @@ -266,6 +257,26 @@ env.Append(CPPPATH=[Dir(os.getcwd()), FORTRANFLAGS=['-fPIC'], F90FLAGS=['-fPIC']) +# Put headers in place +for header in mglob(env, 'Cantera/cxx/include', 'h'): + header = env.Command('build/include/cantera/%s' % header.name, header, + Copy('$TARGET', '$SOURCE')) + buildTargets.extend(header) + inst = env.Install('$ct_incdir', header) + installTargets.extend(inst) + +for header in mglob(env, 'Cantera/clib/src', 'h'): + hcopy = env.Command('build/include/cantera/clib/%s' % header.name, header, + Copy('$TARGET', '$SOURCE')) + buildTargets.append(header) + inst = env.Install(pjoin('$ct_incdir','clib'), header) + installTargets.extend(inst) + +configh = env.Command('build/include/cantera/config.h', 'config.h', Copy('$TARGET', '$SOURCE')) +inst = env.Install('$ct_incdir', configh) +installTargets.extend(inst) + +# Add targets from the SConscript files in the various subdirectories Export('env', 'buildDir', 'buildTargets', 'installTargets') VariantDir('build/ext', 'ext', duplicate=0) diff --git a/ext/SConscript b/ext/SConscript index c48f59d6b..3d9691160 100644 --- a/ext/SConscript +++ b/ext/SConscript @@ -6,7 +6,6 @@ localenv = env.Clone() # (subdir, library name, (file extensions)) libs = [('tpx','tpx',['cpp'])] -print os.getcwd() if env['build_with_f2c']: libs.append(('f2c_math', 'ctmath', ['cpp','c']))