diff -Naur skim-1.4.5.orig/src/SConscript skim-1.4.5/src/SConscript --- skim-1.4.5.orig/src/SConscript 2006-06-04 11:03:36.000000000 +0900 +++ skim-1.4.5/src/SConscript 2008-11-12 08:45:35.000000000 +0900 @@ -7,8 +7,6 @@ srcenv.Add_define('PACKAGE') srcenv.Add_define('SCIM_VERSION') srcenv.AppendUnique(CCFLAGS = env['SCIM_CFLAGS'] ) -srcenv.AppendUnique(LINKFLAGS = env['SCIM_LIBS']) -srcenv.AppendUnique(LINKFLAGS = env['SCIM_X11_LIBS']) srcenv.KDEaddlibs( "qt-mt kdecore kdeui kutils" ) libskim=srcenv.Copy() @@ -23,13 +21,13 @@ #libskim.KDEaddlibs( "qt-mt kdecore kdeui kutils" ) libskim.Add_define('SCIM_BINARY_VERSION') libskim.Add_define('SCIM_LIBDIR') -libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version()) +libskim.KDEshlib( 'libskim', libskim_sources, kdelib=1, vnum=libskim.libskim_version(), localshlibs='#/utils/libscim-kdeutils.la', globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS'])) ## IMPORTANT: this shows how to link against shared libraries skim=srcenv.Copy() skim_localshlibs='#src/libskim.so #utils/libscim-kdeutils.so' skim_sources = 'main.cpp' -skim_globallibs = '' +skim_globallibs = env['SCIM_LIBS'] + env['SCIM_X11_LIBS'] skim_includes = '#/ #/src' skim.KDEprogram( target = 'skim', diff -Naur skim-1.4.5.orig/utils/SConscript skim-1.4.5/utils/SConscript --- skim-1.4.5.orig/utils/SConscript 2006-06-04 11:03:36.000000000 +0900 +++ skim-1.4.5/utils/SConscript 2008-11-12 08:52:49.000000000 +0900 @@ -4,7 +4,7 @@ utils=env.Copy() utils_sources='scimkdesettings.kcfgc scimmovehandle.cpp scimdragableframe.cpp scimxmlguibuilder.cpp scimactions.cpp scimtoolbar.cpp kautocmodule.cpp skimplugininfo.cpp' -utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version() ) +utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version(), globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS'])) utils.KDEaddpaths_includes( "#/ #/src" ) utils.KDEaddlibs( "qt-mt kdecore kdeui" )