Upstream version 11.39.264.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / tools / linux / xwalk_application_tools.gyp

diff --git a/src/xwalk/application/tools/linux/xwalk_application_tools.gyp b/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
index bafe531..e3bc48d 100644 (file)
--- a/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
+++ b/src/xwalk/application/tools/linux/xwalk_application_tools.gyp
@@ -1,44 +1,6 @@
 {
   'targets': [
     {
-      'target_name': 'gio',
-      'type': 'none',
-      'variables': {
-        'glib_packages': 'glib-2.0 gio-unix-2.0',
-      },
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(pkg-config --cflags <(glib_packages))',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))',
-        ],
-        'libraries': [
-          '<!@(pkg-config --libs-only-l <(glib_packages))',
-        ],
-      },
-    },
-    {
-      'target_name': 'xwalkctl',
-      'type': 'executable',
-      'product_name': 'xwalkctl',
-      'dependencies': [
-        'gio',
-      ],
-      'include_dirs': [
-        '../../../..',
-      ],
-      'sources': [
-        'dbus_connection.h',
-        'dbus_connection.cc',
-        'xwalk_tizen_user.h',
-        'xwalk_tizen_user.cc',
-        'xwalkctl_main.cc',
-      ],
-    },
-    {
       'target_name': 'xwalk_launcher',
       'type': 'executable',
       'product_name': 'xwalk-launcher',
@@ -46,31 +8,66 @@
         '../../../..',
       ],
       'dependencies': [
+        '../../../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../../build/system.gyp:gio',
         '../../../extensions/extensions.gyp:xwalk_extensions',
+        '../../../application/common/xwalk_application_common.gypi:xwalk_application_common_lib',
+        '../../../dbus/xwalk_dbus.gyp:xwalk_dbus'
       ],
       'sources': [
-        'dbus_connection.h',
-        'dbus_connection.cc',
-        'xwalk_extension_process_launcher.h',
+        'dbus_object_manager.cc',
+        'dbus_object_manager.h',
         'xwalk_extension_process_launcher.cc',
-        'xwalk_tizen_user.h',
-        'xwalk_tizen_user.cc',
+        'xwalk_extension_process_launcher.h',
         'xwalk_launcher_main.cc',
       ],
       'conditions' : [
-        ['OS=="linux"', {
-          'dependencies': [
-            'gio',
-          ],
-        }],
         ['tizen==1', {
           'dependencies': [
-            'gio',
+            '../../../build/system.gyp:tizen',
             '../../../build/system.gyp:tizen_appcore_common'
           ],
           'sources': [
+            'xwalk_launcher.cc',
+            'xwalk_launcher.h',
             'xwalk_launcher_tizen.cc',
             'xwalk_launcher_tizen.h',
+            '../tizen/xwalk_tizen_user.cc',
+            '../tizen/xwalk_tizen_user.h',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'xwalkctl',
+      'type': 'executable',
+      'product_name': 'xwalkctl',
+      'include_dirs': [
+        '../../../..',
+      ],
+      'dependencies': [
+        '../../../application/common/xwalk_application_common.gypi:xwalk_application_common_lib',
+        '../../../build/system.gyp:gio',
+        '../../../../build/linux/system.gyp:dbus',
+        '../../../../dbus/dbus.gyp:dbus',
+      ],
+      'sources': [
+        'xwalkctl_main.cc',
+      ],
+      'conditions' : [
+        ['tizen==1', {
+          'dependencies': [
+            '../../../build/system.gyp:tizen',
+          ],
+          'sources': [
+            '../tizen/xwalk_tizen_user.cc',
+            '../tizen/xwalk_tizen_user.h',
+            '../../../runtime/common/xwalk_paths.cc',
+            '../../../runtime/common/xwalk_paths.h',
+            '../../../runtime/common/xwalk_switches.cc',
+            '../../../runtime/common/xwalk_switches.h',
+            '../../../runtime/common/xwalk_system_locale.cc',
+            '../../../runtime/common/xwalk_system_locale.h',
           ],
         }],
       ],