summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/linux/system.gyp38
-rw-r--r--sandbox/sandbox.gyp2
-rw-r--r--third_party/bzip2/bzip2.gyp2
-rw-r--r--third_party/expat/expat.gyp2
-rw-r--r--third_party/libjpeg/libjpeg.gyp2
-rw-r--r--third_party/libpng/libpng.gyp2
-rw-r--r--third_party/libwebp/libwebp.gyp2
-rw-r--r--third_party/libxml/libxml.gyp2
-rw-r--r--third_party/libxslt/libxslt.gyp2
9 files changed, 27 insertions, 27 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 81b619e..25c001f 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -30,7 +30,7 @@
'targets': [
{
'target_name': 'gtk',
- 'type': 'settings',
+ 'type': 'none',
'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
@@ -71,7 +71,7 @@
},
{
'target_name': 'gtkprint',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -92,7 +92,7 @@
},
{
'target_name': 'ssl',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'conditions': [
@@ -149,7 +149,7 @@
},
{
'target_name': 'freetype2',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -170,7 +170,7 @@
},
{
'target_name': 'fontconfig',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -191,7 +191,7 @@
},
{
'target_name': 'gdk',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -212,7 +212,7 @@
},
{
'target_name': 'gconf',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_gconf==1 and _toolset=="target"', {
'direct_dependent_settings': {
@@ -236,7 +236,7 @@
},
{
'target_name': 'gio',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_gio==1 and _toolset=="target"', {
'direct_dependent_settings': {
@@ -308,7 +308,7 @@
},
{
'target_name': 'xext',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -329,7 +329,7 @@
},
{
'target_name': 'libgcrypt',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target" and use_cups==1', {
'direct_dependent_settings': {
@@ -347,7 +347,7 @@
},
{
'target_name': 'selinux',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['_toolset=="target"', {
'link_settings': {
@@ -360,7 +360,7 @@
},
{
'target_name': 'gnome_keyring',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_gnome_keyring==1', {
'direct_dependent_settings': {
@@ -403,7 +403,7 @@
# link directly in this version of the target to allow this.
# *** Do not use this target in the main binary! ***
'target_name': 'gnome_keyring_direct',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_gnome_keyring==1', {
'direct_dependent_settings': {
@@ -432,7 +432,7 @@
},
{
'target_name': 'dbus',
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags dbus-1)',
@@ -450,7 +450,7 @@
{
# TODO(satorux): Remove this once dbus-glib clients are gone.
'target_name': 'dbus-glib',
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags dbus-glib-1)',
@@ -467,7 +467,7 @@
},
{
'target_name': 'glib',
- 'type': 'settings',
+ 'type': 'none',
'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
@@ -544,7 +544,7 @@
},
{
'target_name': 'libresolv',
- 'type': 'settings',
+ 'type': 'none',
'link_settings': {
'libraries': [
'-lresolv',
@@ -553,7 +553,7 @@
},
{
'target_name': 'ibus',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_ibus==1', {
'variables': {
@@ -578,7 +578,7 @@
},
{
'target_name': 'wayland',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
['use_wayland == 1', {
'cflags': [
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index cbabb71..f7ebcd7 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -136,7 +136,7 @@
'targets': [
{
'target_name': 'sandbox',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
# Only compile in the seccomp code for the flag combination
# where we support it.
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index 42bdf4e..72730df 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -49,7 +49,7 @@
'targets': [
{
'target_name': 'bzip2',
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'defines': [
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index fc91513..b4f2cd5 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -21,7 +21,7 @@
'targets': [
{
'target_name': 'expat',
- 'type': 'settings',
+ 'type': 'none',
'link_settings': {
'libraries': [
'-lexpat',
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index 2fe1f78..12cc882 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -89,7 +89,7 @@
'targets': [
{
'target_name': 'libjpeg',
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_LIBJPEG',
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 1b960b1..ffc0369 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -91,7 +91,7 @@
'targets': [
{
'target_name': 'libpng',
- 'type': 'settings',
+ 'type': 'none',
'dependencies': [
'../zlib/zlib.gyp:zlib',
],
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 3acf992..6df7a08 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -64,7 +64,7 @@
'targets': [
{
'target_name': 'libwebp',
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'defines': [
'ENABLE_WEBP',
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 9f27263..56ba94f 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -20,7 +20,7 @@
'target_name': 'libxml',
'conditions': [
['os_posix == 1 and OS != "mac" and use_system_libxml', {
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags libxml-2.0)',
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 7dfd093..4ac5e6c 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -22,7 +22,7 @@
'target_name': 'libxslt',
'conditions': [
['os_posix == 1 and OS != "mac" and use_system_libxml', {
- 'type': 'settings',
+ 'type': 'none',
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags libxslt)',
generated by cgit v1.1 at 2025-01-13 03:25:33 +0000