commit 7aa2dd0a23e526dd6e02fa5de55486ca6c821bd1
Author: Gustavo Carneiro <gjc@nazgul.(none)>
Date:   Sat Nov 10 12:40:27 2007 +0000

    Build libgbus and libselftest as objects, not static library; also build with -fPIC, otherwise it won't link on x86_64.

diff --git a/libgbus/wscript_build b/libgbus/wscript_build
index a87c85f..130cd09 100644
--- a/libgbus/wscript_build
+++ b/libgbus/wscript_build
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 
 #Marshall file
-libgbus = bld.create_obj('gnome', 'staticlib')
+libgbus = bld.create_obj('gnome', 'objects')
+libgbus.env.append_value('CCFLAGS', libgbus.env['shlib_CCFLAGS'])
 libgbus.add_marshal_file('libgbus-marshal.list', 'libgbus_marshal', '--header')
 libgbus.add_marshal_file('libgbus-marshal.list', 'libgbus_marshal', '--body')
 libgbus.uselib = 'GLIB GOBJECT DBUS DBUS_GLIB'
@@ -11,5 +12,5 @@ libgbus.source = """
 """
 
 libgbus.includes = '.'
-libgbus.target   = 'libgbus'
+#libgbus.target   = 'libgbus'
 libgbus.name     = 'libgbus'
diff --git a/libpackagekit/wscript_build b/libpackagekit/wscript_build
index 9aa3a62..2c4cca9 100644
--- a/libpackagekit/wscript_build
+++ b/libpackagekit/wscript_build
@@ -5,7 +5,7 @@ libpackagekit = bld.create_obj('gnome', 'shlib')
 libpackagekit.add_marshal_file('pk-marshal.list', 'pk_marshal', '--header')
 libpackagekit.add_marshal_file('pk-marshal.list', 'pk_marshal', '--body')
 libpackagekit.uselib = 'GLIB GOBJECT DBUS DBUS_GLIB'
-libpackagekit.uselib_local = 'libgbus libselftest'
+libpackagekit.add_objects = 'libgbus libselftest'
 libpackagekit.target = 'packagekit'
 
 libpackagekit.source = """
@@ -23,7 +23,7 @@ libpackagekit.source = """
 """
 
 libpackagekit.includes      = '. ../libgbus ../libselftest'
-libpackagekit.target        = 'libpackagekit'
+libpackagekit.target        = 'packagekit'
 libpackagekit.name          = 'libpackagekit'
 
 #TODO: Need to install headers to /usr/include/packagekit/
diff --git a/libselftest/wscript_build b/libselftest/wscript_build
index ec4d805..b76ba8c 100644
--- a/libselftest/wscript_build
+++ b/libselftest/wscript_build
@@ -1,7 +1,9 @@
 #!/usr/bin/python
 
 #Marshall file
-libselftest = bld.create_obj('gnome', 'staticlib')
+libselftest = bld.create_obj('gnome', 'objects')
+libselftest.env.append_value('CCFLAGS', libselftest.env['shlib_CCFLAGS'])
+
 libselftest.uselib = 'GLIB GOBJECT'
 
 libselftest.source = """
@@ -9,5 +11,5 @@ libselftest.source = """
 """
 
 libselftest.includes = '.'
-libselftest.target   = 'libselftest'
+#libselftest.target   = 'libselftest'
 libselftest.name     = 'libselftest'