Refactor Linux packaging targets for better dependency tracking.

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
     ['OS=="win"', {
       'targets': [
@@ skipping 363 matching lines @@
             'setup/run_all_unittests.cc',
             'setup/setup_util.cc',
             'setup/setup_util_unittest.cc',
           ],
         },
       ],
     }],
     ['OS=="linux" and branding=="Chrome"', {
       # Always google_chrome since this only applies to branding==Chrome.
       'variables': {
-         'branding_dir': '../app/theme/google_chrome',
+        'branding_dir': '../app/theme/google_chrome',
+        'packaging_files_common': [
+          'linux/internal/common/apt.include',
+          'linux/internal/common/default-app.template',
+          'linux/internal/common/default-app-block.template',
+          'linux/internal/common/desktop.template',
+          'linux/internal/common/google-chrome/google-chrome.info',
+          'linux/internal/common/installer.include',
+          'linux/internal/common/postinst.include',
+          'linux/internal/common/prerm.include',
+          'linux/internal/common/repo.cron',
+          'linux/internal/common/rpm.include',
+          'linux/internal/common/rpmrepo.cron',
+          'linux/internal/common/updater',
+          'linux/internal/common/variables.include',
+          'linux/internal/common/wrapper',
+        ],
+        'packaging_files_deb': [
+          'linux/internal/debian/build.sh',
+          'linux/internal/debian/changelog.template',
+          'linux/internal/debian/control.template',
+          'linux/internal/debian/postinst',
+          'linux/internal/debian/postrm',
+          'linux/internal/debian/prerm',
+        ],
+        'packaging_files_rpm': [
+          'linux/internal/rpm/build.sh',
+          'linux/internal/rpm/chrome.spec.template',
+        ],
       },
       'targets': [
         {
           'target_name': 'installer_util',
           'type': 'none',
           # Add these files to the build output so the build archives will be
           # "hermetic" for packaging. This is only for branding="Chrome" since
           # we only create packages for official builds.
           'copies': [
             # Copy tools for generating packages from the build archive.
             {
               'destination': '<(PRODUCT_DIR)/installer/',
               'files': [
                 'linux/internal/build_from_archive.sh',
               ]
             },
             {
               'destination': '<(PRODUCT_DIR)/installer/debian/',
               'files': [
-                'linux/internal/debian/build.sh',
-                'linux/internal/debian/changelog.template',
-                'linux/internal/debian/control.template',
-                'linux/internal/debian/postinst',
-                'linux/internal/debian/postrm',
-                'linux/internal/debian/prerm',
+                '<@(packaging_files_deb)',
               ]
             },
             {
               'destination': '<(PRODUCT_DIR)/installer/rpm/',
               'files': [
-                'linux/internal/rpm/build.sh',
-                'linux/internal/rpm/chrome.spec.template',
+                '<@(packaging_files_rpm)',
               ]
             },
             {
               'destination': '<(PRODUCT_DIR)/installer/common/',
               'files': [
-                'linux/internal/common/apt.include',
-                'linux/internal/common/default-app.template',
-                'linux/internal/common/default-app-block.template',
-                'linux/internal/common/desktop.template',
-                'linux/internal/common/google-chrome/google-chrome.info',
-                'linux/internal/common/installer.include',
-                'linux/internal/common/postinst.include',
-                'linux/internal/common/prerm.include',
-                'linux/internal/common/repo.cron',
-                'linux/internal/common/rpm.include',
-                'linux/internal/common/rpmrepo.cron',
-                'linux/internal/common/updater',
-                'linux/internal/common/wrapper',
+                '<@(packaging_files_common)',
               ]
             },
             # Additional theme resources needed for package building.
             {
               'destination': '<(PRODUCT_DIR)/installer/theme/',
               'files': [
                 '<(branding_dir)/product_logo_16.png',
                 '<(branding_dir)/product_logo_32.png',
                 '<(branding_dir)/product_logo_48.png',
                 '<(branding_dir)/product_logo_256.png',
@@ skipping 67 matching lines @@
             # for the 'channel' variable.
             {
               'variables': {
                 'channel': 'unstable',
               },
               'action_name': 'deb_packages_<(channel)',
               'process_outputs_as_sources': 1,
               'inputs': [
                 '<(deb_build)',
                 '<@(input_files)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)_<(deb_arch).deb',
               ],
               'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
             },
             {
               'variables': {
                 'channel': 'beta',
               },
               'action_name': 'deb_packages_<(channel)',
               'process_outputs_as_sources': 1,
               'inputs': [
                 '<(deb_build)',
                 '<@(input_files)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)_<(deb_arch).deb',
               ],
               'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
             },
             {
               'variables': {
                 'channel': 'stable',
               },
               'action_name': 'deb_packages_<(channel)',
               'process_outputs_as_sources': 1,
               'inputs': [
                 '<(deb_build)',
                 '<@(input_files)',
+                '<@(packaging_files_common)',
+                '<@(packaging_files_deb)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/google-chrome-<(channel)_<(version)-r<(revision)_<(deb_arch).deb',
               ],
               'action': [ '<@(deb_cmd)', '-c', '<(channel)', ],
             },
           ],
           'conditions': [
             ['chromeos==0 and toolkit_views==0', {
               'actions': [
                 {
                   'variables': {
                     'channel': 'unstable',
                   },
                   'action_name': 'rpm_packages_<(channel)',
                   'process_outputs_as_sources': 1,
                   'inputs': [
                     '<(rpm_build)',
                     '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
                     '<@(input_files)',
+                    '<@(packaging_files_common)',
+                    '<@(packaging_files_rpm)',
                   ],
                   'outputs': [
                     '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-<(revision).<(rpm_arch).rpm',
                   ],
                   'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
                 },
                 {
                   'variables': {
                     'channel': 'beta',
                   },
                   'action_name': 'rpm_packages_<(channel)',
                   'process_outputs_as_sources': 1,
                   'inputs': [
                     '<(rpm_build)',
                     '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
                     '<@(input_files)',
+                    '<@(packaging_files_common)',
+                    '<@(packaging_files_rpm)',
                   ],
                   'outputs': [
                     '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-<(revision).<(rpm_arch).rpm',
                   ],
                   'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
                 },
                 {
                   'variables': {
                     'channel': 'stable',
                   },
                   'action_name': 'rpm_packages_<(channel)',
                   'process_outputs_as_sources': 1,
                   'inputs': [
                     '<(rpm_build)',
                     '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
                     '<@(input_files)',
+                    '<@(packaging_files_common)',
+                    '<@(packaging_files_rpm)',
                   ],
                   'outputs': [
                     '<(PRODUCT_DIR)/google-chrome-<(channel)-<(version)-<(revision).<(rpm_arch).rpm',
                   ],
                   'action': [ '<@(rpm_cmd)', '-c', '<(channel)', ],
                 },
               ],
             }],
             ['target_arch=="x64"', {
               # TODO(mmoss) 64-bit RPMs not ready yet.
@@ skipping 12 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: