X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=5fe796baeb53ac0fc50bd3bab2f06fc091d874f7;hb=160f4413563be5515d5c1d2884b06bc9807ea6dd;hp=376a87d6385217c9fbf0dd94b58cc9fc150a12b1;hpb=4004cfae8ca0e03a40385560e14bba730a801464;p=senf.git diff --git a/SConstruct b/SConstruct index 376a87d..5fe796b 100644 --- a/SConstruct +++ b/SConstruct @@ -118,7 +118,7 @@ INLINE_OPTS = [ '-finline-limit=5000' ] env.Append( CPPPATH = [ '#/include' ], CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ] + INLINE_OPTS, - LIBS = [ 'readline', 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', + LIBS = [ 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', '$BOOSTFSLIB' ], TEST_EXTRA_LIBS = [ ], DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ], @@ -128,7 +128,8 @@ env.Append( 'LOGNAME' : logname, # needed by the debian build scripts 'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1", 'SCONS' : 1, - 'PATH' : os.environ.get('PATH') + 'PATH' : os.environ.get('PATH'), + 'TEXINPUTS' : os.environ.get('TEXINPUTS',':'), }, LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ], DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '_templates' ], @@ -182,11 +183,6 @@ if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ env.Clean('all', '.prepare-stamp') -# Not nice, but until we get to fixing the dependency jungle -# concerning generated sources ... -scripts = [] -dependencies = [] - SConscript(glob.glob("*/SConscript")) SENFSCons.StandardTargets(env)