From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 5 Jan 2009 19:23:56 +0000 (+0100)
Subject: Update Waf to 1.5.2 and update build scripts accordingly
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aebd813c687c8b36fd9032f113341c71315b597e;p=midori

Update Waf to 1.5.2 and update build scripts accordingly
---

diff --git a/katze/wscript_build b/katze/wscript_build
index 4d1ba61c..128fd357 100644
--- 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 3e4aa9b4..3e3b1324 100644
--- 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 935acbf5..a22ad09a 100755
Binary files a/waf and b/waf differ