Don't expressly use libkatze in extensions to avoid -fPIC problem

diff --git a/extensions/wscript_build b/extensions/wscript_build
index 8ce7027f894981cb5019a6cd8fa35b2ec4d0c347..1ea845d288db87782562f300c6cabe49c046c832 100644 (file)
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -26,5 +26,4 @@ for extension in extensions:
     obj.includes = '..'
     obj.source = source
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
-    obj.uselib_local = 'katze'
     obj.install_path = '${LIBDIR}/midori'

diff --git a/katze/wscript_build b/katze/wscript_build
index 27a24fc29102c8365053849ec1d58d1398fdd589..52c282dd7d1f85d82b7dc8ac872de31a808977d6 100644 (file)
--- a/katze/wscript_build
+++ b/katze/wscript_build
@@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.')
 obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
 obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
 obj.install_path = None
-
-if platform.architecture ()[0] == '64bit':
-    obj.env.append_value ('CCFLAGS', '-fPIC')

diff --git a/midori/wscript_build b/midori/wscript_build
index 91f53026d0d4849d35689d7a52e34cb5a7afdb0a..87eba0ea5f567aafbd4a0cd2e190ddc8f924b1dd 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON'
 obj.uselib_local = 'katze'
 obj.install_path = None
 
-if platform.architecture ()[0] == '64bit':
-    obj.env.append_value ('CCFLAGS', '-fPIC')
-
 obj = bld.new_task_gen ('cc', 'staticlib')
 obj.name = 'panels'
 obj.target = 'panels'
@@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
 obj.uselib_local = 'midori'
 obj.install_path = None
 
-if platform.architecture ()[0] == '64bit':
-    obj.env.append_value ('CCFLAGS', '-fPIC')
-
 obj = bld.new_task_gen ('cc', 'program')
 obj.target = 'midori'
 obj.includes = '. .. ../panels'