diff --git a/.gitignore b/.gitignore index ba94cce312165d0fe99f4002d205ddfd87115dc4..76ce801066d07693ffb20fa76df7423b525efdd8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ build test/MemorySpace.exe test/Options.exe test/Range.exe +scons_build diff --git a/SConscript b/SConscript index 337b5a25ef6bf4fe35488d146346f441f769a3fb..a29729dc444049d795ed9fe9ebffdccbd0299939 100644 --- a/SConscript +++ b/SConscript @@ -9,6 +9,8 @@ Import('env') # build security transforms irdbenv=env.Clone(); +print "zipr's LINKFLAGS="+env['LINKFLAGS'] + zipr=SConscript("src/SConscript", variant_dir='scons_build/zipr') if sysname != "SunOS": @@ -20,4 +22,5 @@ pedi = Command( target = "./testoutput", Depends(pedi,zipr) Default( pedi ) - +ret=pedi+zipr +Return('ret') diff --git a/src/SConscript b/src/SConscript index 38b2f8c8eaab37a7feb78b4f0dfd273916c28c10..c0979f7c0ee5d1b8dd4568454f5a22ad90a41ff1 100644 --- a/src/SConscript +++ b/src/SConscript @@ -76,4 +76,5 @@ ziprexe=myenv.Program("zipr.exe", Split(files)) install=myenv.Install("$ZIPR_INSTALL/bin/", ziprexe) Default(install) -Return('install') +ret=install+ziprexe +Return('ret')