Build 'panels' as a static library to enable their use in tests

diff --git a/midori/wscript_build b/midori/wscript_build
index 5d0ddf3c753228b0c39e70c9d34b0a1cff5c5b07..cae4674f65d9c51bffe624eda79cbf92a4d3ff26 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -14,6 +14,18 @@ obj.uselib = 'UNIQUE LIBSOUP 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'
+obj.includes = '. ..'
+obj.find_sources_in_dirs ('../panels')
+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')
 
@@ -21,6 +33,5 @@ obj = bld.new_task_gen ('cc', 'program')
 obj.target = 'midori'
 obj.includes = '. .. ../panels'
 obj.source = 'main.c'
-obj.find_sources_in_dirs ('../panels')
 obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
-obj.uselib_local = 'midori'
+obj.uselib_local = 'panels'

diff --git a/tests/wscript_build b/tests/wscript_build
index e167569bea93fb9e2b6baeb50490efcf29f0997e..2de915cbe63fe215272fda7e556b7ef16e9c137e 100644 (file)
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -23,8 +23,8 @@ for test in tests:
 
     obj = bld.new_task_gen ('cc', 'program')
     obj.target = 'test-' + target
-    obj.includes = '.. ../midori'
+    obj.includes = '.. ../midori ../panels'
     obj.source = source
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
-    obj.uselib_local = 'midori'
+    obj.uselib_local = 'panels'
     obj.unit_test = 1