From 1c029e8948a9caf7dcf99a534794f61b9965d7b1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Feb 2009 22:01:27 +0100 Subject: [PATCH] Build 'panels' as a static library to enable their use in tests --- midori/wscript_build | 15 +++++++++++++-- tests/wscript_build | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/midori/wscript_build b/midori/wscript_build index 5d0ddf3c..cae4674f 100644 --- 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 e167569b..2de915cb 100644 --- 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