[Xfce4-commits] <midori:master> Build Vala and C parts of core separately

[Christian Dywan]

Updating branch refs/heads/master
         to 0efe48e5cd5995610c2dcba85612c1e70c32d96f (commit)
       from fd28a425596cf201c9e51e2f0f2402b66a4db54c (commit)

commit 0efe48e5cd5995610c2dcba85612c1e70c32d96f
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Mar 19 19:00:44 2013 +0100

    Build Vala and C parts of core separately
    
    So generated C code warnings can be avoided.

 midori/wscript_build |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/midori/wscript_build b/midori/wscript_build
index 3574e7f..e42462b 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -20,11 +20,9 @@ if Options.commands['build'] or Options.commands['check']:
 if progressive:
     obj = bld.new_task_gen ('cc', 'staticlib')
     obj.target = 'midori-core'
-    obj.includes = '.. ../katze . ../toolbars'
-    obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', excludes=['main.c'])
+    obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.vala'])
+    obj.env.append_value ('CCFLAGS', '-w')
     obj.uselib = libs
-    obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
-    obj.install_path = None
     obj.vapi_dirs = '../midori ../katze'
     obj.packages = 'glib-2.0 gmodule-2.0 gio-2.0 libsoup-2.4 posix sqlite3'
     if bld.env['HAVE_WEBKIT2']:
@@ -37,6 +35,17 @@ if progressive:
         obj.packages += ' gtk+-2.0'
     if bld.env['HAVE_GRANITE']:
         obj.packages += ' clutter-gtk-1.0 granite'
+    obj.install_path = None
+    bld.add_group ()
+
+    obj = bld.new_task_gen ('cc', 'staticlib')
+    obj.target = 'midori-c'
+    obj.includes = '.. ../katze . ../toolbars'
+    obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.c'], excludes=['main.c'])
+    obj.uselib = libs
+    obj.uselib_local = 'midori-core'
+    obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
+    obj.install_path = None
     bld.add_group ()
 
     obj = bld.new_task_gen ('cc', 'program')
@@ -44,6 +53,6 @@ if progressive:
     obj.includes = '.. ../katze . ../panels'
     obj.source = './main.c'
     obj.uselib = libs
-    obj.uselib_local = 'midori-core'
+    obj.uselib_local = 'midori-c'
     if bld.env['WINRC']:
         obj.source += ' ../data/midori.rc'