Update Waf to 1.5.2 and update build scripts accordingly

diff --git a/katze/wscript_build b/katze/wscript_build
index 4d1ba61cfd2c6ff93d56e50b8d5f360c8494081a..128fd357d8c5b25442007e53b2010c835c8597db 100644 (file)
--- a/katze/wscript_build
+++ b/katze/wscript_build
@@ -7,7 +7,7 @@ import platform
 obj = bld.new_task_gen ('cc', 'staticlib')
 obj.name = 'katze'
 obj.target = 'katze'
-obj.includes = '.'
+obj.includes = '. ../.'
 obj.find_sources_in_dirs ('.')
 obj.uselib = 'GMODULE LIBSOUP GTK LIBXML'
 obj.install_path = None

diff --git a/midori/wscript_build b/midori/wscript_build
index 3e4aa9b4d9f7cd08a2ff548847eba521076dc311..3e3b132447d6572a65c3dac88fb14345ffcbfb05 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -3,8 +3,6 @@
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
 obj = bld.new_task_gen ('cc', 'program')
-# After waf 1.4.4 this additional link flag is needed for extensions
-obj.env.append_value ('LINKFLAGS', '-Wl,--export-dynamic')
 obj.target = 'midori'
 obj.includes = '. .. ../panels'
 obj.find_sources_in_dirs ('. ../panels')

diff --git a/waf b/waf
index 935acbf50cf0859f79f8cff6d06df2310db051ea..a22ad09a741dadb0c3341468d8b636d1dc055f14 100755 (executable)
Binary files a/waf and b/waf differ