Include mojo_main_{chromium,standalone}.cc instead of using a target

mojo/mojo_examples.gypi

 # Copyright 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'mojo_sample_app',
       'type': 'shared_library',
       'dependencies': [
         # TODO(darin): we should not be linking against these libraries!
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        'mojo_application',
         'mojo_cpp_bindings',
         'mojo_environment_standalone',
         'mojo_geometry_bindings',
         'mojo_gles2',
-        'mojo_main_standalone',
         'mojo_native_viewport_bindings',
         'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
+        '<(mojo_main_standalone)',
       ],
     },
     {
       'target_name': 'package_mojo_sample_app',
       'variables': {
         'app_name': 'mojo_sample_app',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_compositor_app',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        'mojo_application',
         'mojo_cc_support',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2',
-        'mojo_main_chromium',
         'mojo_native_viewport_bindings',
         'mojo_system_impl',
       ],
       'sources': [
         'examples/compositor_app/compositor_app.cc',
         'examples/compositor_app/compositor_host.cc',
         'examples/compositor_app/compositor_host.h',
+        '<(mojo_main_chromium)',
       ],
     },
     {
       'target_name': 'package_mojo_compositor_app',
       'variables': {
         'app_name': 'mojo_compositor_app',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_wget',
       'type': 'shared_library',
       'dependencies': [
+        'mojo_application',
         'mojo_cpp_bindings',
         'mojo_environment_standalone',
-        'mojo_main_standalone',
         'mojo_network_bindings',
         'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'examples/wget/wget.cc',
+        '<(mojo_main_standalone)',
       ],
     },
     {
       'target_name': 'package_mojo_wget',
       'variables': {
         'app_name': 'mojo_wget',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_pepper_container_app',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../gpu/gpu.gyp:command_buffer_common',
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         '../ui/events/events.gyp:events_base',
+        'mojo_application',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_gles2',
-        'mojo_main_chromium',
         'mojo_native_viewport_bindings',
         'mojo_system_impl',
       ],
       'defines': [
         # We don't really want to export. We could change how
         # ppapi_{shared,thunk}_export.h are defined to avoid this.
         'PPAPI_SHARED_IMPLEMENTATION',
         'PPAPI_THUNK_IMPLEMENTATION',
       ],
       'sources': [
@@ skipping 58 matching lines @@
         'examples/pepper_container_app/plugin_instance.cc',
         'examples/pepper_container_app/plugin_instance.h',
         'examples/pepper_container_app/plugin_module.cc',
         'examples/pepper_container_app/plugin_module.h',
         'examples/pepper_container_app/ppb_core_thunk.cc',
         'examples/pepper_container_app/ppb_opengles2_thunk.cc',
         'examples/pepper_container_app/resource_creation_impl.cc',
         'examples/pepper_container_app/resource_creation_impl.h',
         'examples/pepper_container_app/thunk.h',
         'examples/pepper_container_app/type_converters.h',
+        '<(mojo_main_chromium)',
       ],
     },
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           'target_name': 'mojo_aura_demo',
           'type': 'shared_library',
           'dependencies': [
@@ skipping 12 matching lines @@
             'mojo_geometry_lib',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
           ],
           'sources': [
             'examples/aura_demo/context_factory_view_manager.cc',
             'examples/aura_demo/context_factory_view_manager.h',
             'examples/aura_demo/window_tree_host_view_manager.cc',
             'examples/aura_demo/window_tree_host_view_manager.h',
             'examples/aura_demo/aura_demo.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
           'target_name': 'mojo_aura_demo_init',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             'mojo_application',
             'mojo_environment_chromium',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
           ],
           'sources': [
             'examples/aura_demo/view_manager_init.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
           'target_name': 'package_mojo_aura_demo',
           'variables': {
             'app_name': 'mojo_aura_demo',
           },
           'includes': [ 'build/package_app.gypi' ],
         },
         {
@@ skipping 59 matching lines @@
             'mojo_cpp_bindings',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_view_manager_bindings',
             'mojo_system_impl',
             'mojo_utility',
           ],
           'sources': [
             'examples/demo_launcher/demo_launcher.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
           'target_name': 'mojo_window_manager',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_application',
             'mojo_cpp_bindings',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_view_manager_lib',
             'mojo_system_impl',
             'mojo_utility',
           ],
           'sources': [
             'examples/window_manager/window_manager.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
           'target_name': 'mojo_embedded_app',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_application',
             'mojo_cpp_bindings',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_gles2',
             'mojo_view_manager_lib',
             'mojo_system_impl',
             'mojo_utility',
           ],
           'sources': [
             'examples/embedded_app/embedded_app.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
       ],
     }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'mojo_dbus_echo',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
+            'mojo_application',
             'mojo_cpp_bindings',
             'mojo_environment_standalone',
             'mojo_echo_bindings',
-            'mojo_main_standalone',
             'mojo_system',
             'mojo_utility',
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_app.cc',
+            '<(mojo_main_standalone)',

[darin (slow to review), 2014/06/05 18:02:47]

why not just path/to/mojo_main_standalone.cc? wouldn't that be a lot easier to
read?

[jamesr, 2014/06/05 18:12:18]

+infinity.  using a gyp variable makes things really really complicated,
especially if the person making the application wants to do something else (like
define sources list in their own variable or in a gypi) where they have to start
fighting gyp variable expansion rules.  Just have people list out the source
file in the sources list.

[DaveMoore, 2014/06/05 20:18:42]

Done.

[DaveMoore, 2014/06/05 20:18:42]

Done.

           ],
         },
       ],
     }],
   ],
 }