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

This commit is contained in:
Christian Dywan 2009-02-15 22:01:27 +01:00
parent 3535c6e767
commit 1c029e8948
2 changed files with 15 additions and 4 deletions

View file

@ -14,6 +14,18 @@ obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
obj.uselib_local = 'katze' obj.uselib_local = 'katze'
obj.install_path = None 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': if platform.architecture ()[0] == '64bit':
obj.env.append_value ('CCFLAGS', '-fPIC') obj.env.append_value ('CCFLAGS', '-fPIC')
@ -21,6 +33,5 @@ obj = bld.new_task_gen ('cc', 'program')
obj.target = 'midori' obj.target = 'midori'
obj.includes = '. .. ../panels' obj.includes = '. .. ../panels'
obj.source = 'main.c' obj.source = 'main.c'
obj.find_sources_in_dirs ('../panels')
obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
obj.uselib_local = 'midori' obj.uselib_local = 'panels'

View file

@ -23,8 +23,8 @@ for test in tests:
obj = bld.new_task_gen ('cc', 'program') obj = bld.new_task_gen ('cc', 'program')
obj.target = 'test-' + target obj.target = 'test-' + target
obj.includes = '.. ../midori' obj.includes = '.. ../midori ../panels'
obj.source = source obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
obj.uselib_local = 'midori' obj.uselib_local = 'panels'
obj.unit_test = 1 obj.unit_test = 1