Don't compile installer_util_strings.rc as a separate .res,

it's getting #included by the other .rc files that need it.
(While here, refactor the way the libs are configured for consistency.)

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1128 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 10 deletions

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index 1d01a72..2bbb826 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -47,7 +47,6 @@ env_res.Append(
 
 resources = [
     env_res.RES('setup.rc'),
-    env_res.RES('../util/installer_util_strings.rc'),
 ]
 
 
@@ -59,11 +58,12 @@ env.Prepend(
         '#/..',
     ],
     LIBS = [
+        'base',
         'bspatch',
-        'lzma_sdk',
-        'icuuc',
         'common',
-        'base',
+        'icuuc',
+        'lzma_sdk',
+        'util',
     ],
 )
 
@@ -89,7 +89,6 @@ env.Prepend(
         '/MAP:${TARGETS[2]}',
     ],
     LIBS = [
-        'shlwapi.lib',
         'msi.lib',
     ],
 )
@@ -102,10 +101,6 @@ input_files = [
     'uninstall.cc',
 ]
 
-libs = [
-    '../util/util.lib',
-]
-
 if env['PLATFORM'] == 'win32':
   targets = [
       'setup.exe',
@@ -115,7 +110,7 @@ if env['PLATFORM'] == 'win32':
 else:
   targets = ['setup']
 
-exe = env.ChromeProgram(targets, resources + input_files + libs)
+exe = env.ChromeProgram(targets, resources + input_files)
 i = env.Install('$TARGET_ROOT', exe)
 
 env.Alias('chrome', i)