From d9dfd6a6ead7b184e941f3b4e8a7d23efa235a76 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 30 Apr 2008 16:23:24 +0100 Subject: [PATCH] Remove the workarounds for waf bug #37 --- examples/a/wscript | 4 +--- examples/b/wscript | 4 +--- examples/c/wscript | 4 +--- examples/d/wscript | 4 +--- examples/e/wscript | 4 +--- examples/f/wscript | 4 +--- tests/c-hello/wscript | 3 +-- tests/wscript | 8 ++------ 8 files changed, 9 insertions(+), 26 deletions(-) diff --git a/examples/a/wscript b/examples/a/wscript index 1a09ded..c6f700c 100644 --- a/examples/a/wscript +++ b/examples/a/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'a' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/examples/b/wscript b/examples/b/wscript index c9b83c5..ee2af23 100644 --- a/examples/b/wscript +++ b/examples/b/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'b' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/examples/c/wscript b/examples/c/wscript index adf783b..a466e82 100644 --- a/examples/c/wscript +++ b/examples/c/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'c' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/examples/d/wscript b/examples/d/wscript index 9f1a404..46c9612 100644 --- a/examples/d/wscript +++ b/examples/d/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'd' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/examples/e/wscript b/examples/e/wscript index cb1113e..39b8ca2 100644 --- a/examples/e/wscript +++ b/examples/e/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'e' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/examples/f/wscript b/examples/f/wscript index 96b824b..34d0c14 100644 --- a/examples/f/wscript +++ b/examples/f/wscript @@ -25,6 +25,4 @@ def build(bld): ] obj.target = 'f' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' diff --git a/tests/c-hello/wscript b/tests/c-hello/wscript index 7423ba0..7ede17d 100644 --- a/tests/c-hello/wscript +++ b/tests/c-hello/wscript @@ -32,6 +32,5 @@ def build(bld): ] obj.target = 'hello' obj.inst_var = 0 # do not install + obj.includes = '.' - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) diff --git a/tests/wscript b/tests/wscript index 2371093..372f47a 100644 --- a/tests/wscript +++ b/tests/wscript @@ -49,9 +49,7 @@ def build(bld): ] obj.target = 'foo' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' ## automatic code scanning using gccxml if bld.env()['ENABLE_PYGCCXML']: @@ -70,9 +68,7 @@ def build(bld): ] obj.target = 'foo2' obj.inst_var = 0 # do not install - - ## Workaround a WAF bug (http://code.google.com/p/waf/issues/detail?id=37) - obj.env.append_value("CPPPATH", bld.m_curdirnode.srcpath(obj.env)) + obj.includes = '.' ## pure C tests bld.add_subdirs('c-hello')