Chrome Frame GYP file cleanup.

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 200 matching lines @@
         '../testing/gtest.gyp:gtest',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
         'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
         '../base/test_suite.h',
-        'bind_context_info.cc',
-        'bind_context_info.h',
         'test/automation_client_mock.cc',
         'test/automation_client_mock.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_automation_mock.cc',
         'test/chrome_frame_automation_mock.h',
         'test/http_server.cc',
         'test/http_server.h',
         'test/ie_event_sink.cc',
         'test/ie_event_sink.h',
@@ skipping 10 matching lines @@
         'test/test_server.h',
         'test/test_server_test.cc',
         'test/test_with_web_server.cc',
         'test/test_with_web_server.h',
         'test/ui_test.cc',
         'test/urlmon_moniker_tests.h',
         'test/urlmon_moniker_integration_test.cc',
         'test/url_request_test.cc',
         'test/window_watchdog.cc',
         'test/window_watchdog.h',
-        'chrome_frame_automation.cc',
-        'chrome_frame_histograms.h',
-        'chrome_frame_histograms.cc',
         'chrome_tab.h',
         'chrome_tab.idl',
-        'com_message_event.cc',
-        'custom_sync_call_context.h',        
-        'html_utils.cc',
-        'http_negotiate.h',
-        'http_negotiate.cc',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
         'test_utils.cc',
         'test_utils.h',
-        'urlmon_upload_data_stream.h',
-        'urlmon_upload_data_stream.cc',
-        'urlmon_url_request.h',
-        'urlmon_url_request.cc',
-        'utils.cc',
-        'utils.h',
-        'vtable_patch_manager.h',
-        'vtable_patch_manager.cc'
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
         '<(DEPTH)/third_party/wtl/include',
         # To allow including "chrome_tab.h"
         '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
@@ skipping 35 matching lines @@
       ],
       'sources': [
         '../base/perf_test_suite.h',
         '../base/perftimer.cc',
         '../base/test/test_file_util.h',
         '../chrome/test/chrome_process_util.cc',
         '../chrome/test/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
         'chrome_tab.h',
         'chrome_tab.idl',
-        'html_utils.cc',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
         'test/perf/chrome_frame_perftest.h',
         'test/perf/run_all.cc',
         'test/perf/silverlight.cc',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test_utils.cc',
         'test_utils.h',
         'test/window_watchdog.cc',
         'test/window_watchdog.h',
-        'utils.cc',
-        'utils.h',
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
         '<(DEPTH)/third_party/wtl/include',
         # To allow including "chrome_tab.h"
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
@@ skipping 133 matching lines @@
             '../google_update/google_update.gyp:google_update',
           ]
         }],
       ],
     },
 
     {
       'target_name': 'chrome_frame_npapi',
       'type': 'static_library',
       'dependencies': [
+        'chrome_frame_common',
         'chrome_frame_strings',
         'chrome_frame_utils',
         '../chrome/chrome.gyp:common',
         'xulrunner_sdk',
       ],
       'sources': [
-        'chrome_frame_automation.cc',
-        'chrome_frame_automation.h',
-        'chrome_frame_delegate.cc',
-        'chrome_frame_delegate.h',
-        'chrome_frame_plugin.h',
         'chrome_frame_npapi.cc',
         'chrome_frame_npapi.h',
-        'custom_sync_call_context.h',
         'ff_30_privilege_check.cc',
         'ff_privilege_check.h',
-        'html_utils.cc',
-        'html_utils.h',
         'np_browser_functions.cc',
         'np_browser_functions.h',
         'np_event_listener.cc',
         'np_event_listener.h',
         'np_proxy_service.cc',
         'np_proxy_service.h',
         'np_utils.cc',
         'np_utils.h',
         'npapi_url_request.cc',
         'npapi_url_request.h',
         'ns_associate_iid_win.h',
         'ns_isupports_impl.h',
-        'plugin_url_request.cc',
-        'plugin_url_request.h',
         'scoped_ns_ptr_win.h',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
-        'utils.cc',
-        'utils.h',
       ],
     },
     {
       'target_name': 'chrome_frame_strings',
       'type': 'none',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'inputs': [
@@ skipping 38 matching lines @@
        ],
       'sources': [
         'simple_resource_loader.cc',
         'simple_resource_loader.h',
       ],
     },
     {
       'target_name': 'chrome_frame_ie',
       'type': 'static_library',
       'dependencies': [
+        'chrome_frame_common',
         'chrome_frame_strings',
         'chrome_frame_utils',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/bzip2/bzip2.gyp:bzip2',
       ],
       'sources': [
         'bho.cc',
         'bho.h',
         'bho.rgs',
         'bind_context_info.cc',
         'bind_context_info.h',
         'bind_status_callback_impl.cc',
         'bind_status_callback_impl.h',
         'chrome_active_document.cc',
         'chrome_active_document.h',
         'chrome_active_document.rgs',
         'chrome_frame_activex.cc',
         'chrome_frame_activex.h',
         'chrome_frame_activex.rgs',
         'chrome_frame_activex_base.h',
         'chrome_frame_histograms.cc',
         'chrome_frame_histograms.h',
-        'chrome_frame_reporting.cc',
-        'chrome_frame_reporting.h',
-        'chrome_launcher_utils.cc',
-        'chrome_launcher_utils.h',
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
         'chrome_tab.h',
         'chrome_tab.idl',
         'com_message_event.cc',
         'com_message_event.h',
         'com_type_info_holder.cc',
         'com_type_info_holder.h',
         'delete_chrome_history.cc',
         'delete_chrome_history.h',
         'exception_barrier.cc',
         'exception_barrier.h',
         'exception_barrier_lowlevel.asm',
         'find_dialog.cc',
         'find_dialog.h',
+        'function_stub.cc',
         'function_stub.h',
+        'html_utils.h',
+        'html_utils.cc',
         'http_negotiate.cc',
-        'function_stub.cc',
         'http_negotiate.h',
         'iids.cc',
         'in_place_menu.h',
         'metrics_service.cc',
         'metrics_service.h',
         'module_utils.cc',
         'module_utils.h',
         'ole_document_impl.h',
         'protocol_sink_wrap.cc',
         'protocol_sink_wrap.h',
         'register_bho.rgs',
         'stream_impl.cc',
         'stream_impl.h',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
         'extra_system_apis.h',
         'urlmon_bind_status_callback.h',
         'urlmon_bind_status_callback.cc',
         'urlmon_moniker.h',
         'urlmon_moniker.cc',
         'urlmon_url_request.cc',
         'urlmon_url_request.h',
         'urlmon_url_request_private.h',
         'urlmon_upload_data_stream.cc',
         'urlmon_upload_data_stream.h',
+        'utils.h',
+        'utils.cc',
         'vtable_patch_manager.cc',
         'vtable_patch_manager.h',
       ],
       'include_dirs': [
         # To allow including "chrome_tab.h"
         '<(INTERMEDIATE_DIR)',
         '<(INTERMEDIATE_DIR)/../chrome_frame',
       ],
       'conditions': [
         ['OS=="win"', {
@@ skipping 38 matching lines @@
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           'AdditionalOptions': [
             '/safeseh',
           ],
         },
       },
     },
     {
+      'target_name': 'chrome_frame_common',
+      'type': 'static_library',
+      'sources': [
+        'chrome_frame_automation.h',
+        'chrome_frame_automation.cc',
+        'chrome_frame_delegate.h',
+        'chrome_frame_delegate.cc',
+        'chrome_frame_plugin.h',
+        'chrome_launcher_utils.cc',
+        'chrome_launcher_utils.h',
+        'custom_sync_call_context.h',
+        'plugin_url_request.h',
+        'plugin_url_request.cc',
+        'sync_msg_reply_dispatcher.h',
+        'sync_msg_reply_dispatcher.cc',
+      ]
+    },
+    {
       'target_name': 'npchrome_frame',
       'type': 'shared_library',
       'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
       'dependencies': [
         'base_noicu',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'xulrunner_sdk',
         'chrome_frame_launcher.gyp:chrome_launcher',
         '../chrome/chrome.gyp:chrome_version_info',
         '../chrome/chrome.gyp:chrome_version_header',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../build/temp_gyp/googleurl.gyp:googleurl',
       ],
       'sources': [
         'chrome_frame_npapi.rgs',
         'chrome_frame_npapi_entrypoints.cc',
         'chrome_frame_npapi_entrypoints.h',
+        'chrome_frame_reporting.cc',
+        'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
         'chrome_tab.h',
         'chrome_tab.idl',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
         'chrome_tab.rgs',
         'chrome_tab_version.rc',
         'resource.h',
@@ skipping 47 matching lines @@
   ],
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: