diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 12:55:49 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 12:55:49 +0000 |
commit | 653bd5f03ef74274adbec816df10cdfd046b6eea (patch) | |
tree | c96f3829422d2fec66cb3a5bc00995bbba914110 /third_party | |
parent | 74484851bb8f9f1954014a08c81305e74f9b0bda (diff) | |
download | chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.zip chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.gz chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.bz2 |
Basic underpinnings of the gyp equivalent of the Linux SHARED=1 build:
parameterize the 'type' setting of the various library targets, with a
default of 'static_library'.
(Hat tip to Craig Schlenter.)
Review URL: http://codereview.chromium.org/62127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/bzip2/bzip2.gyp | 2 | ||||
-rw-r--r-- | third_party/harfbuzz/harfbuzz.gyp | 4 | ||||
-rw-r--r-- | third_party/libevent/libevent.gyp | 2 | ||||
-rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 2 | ||||
-rw-r--r-- | third_party/libpng/libpng.gyp | 2 | ||||
-rw-r--r-- | third_party/libxml/libxml.gyp | 2 | ||||
-rw-r--r-- | third_party/libxslt/libxslt.gyp | 2 | ||||
-rw-r--r-- | third_party/modp_b64/modp_b64.gyp | 2 | ||||
-rw-r--r-- | third_party/sqlite/sqlite.gyp | 2 | ||||
-rw-r--r-- | third_party/zlib/zlib.gyp | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index 2508bb5..c9f59de 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'bzip2', - 'type': 'static_library', + 'type': '<(library)', 'defines': ['BZ_NO_STDIO'], 'msvs_guid': '2A70CBF0-847E-4E3A-B926-542A656DC7FE', 'sources': [ diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp index 5e98ddb..9d5b408 100644 --- a/third_party/harfbuzz/harfbuzz.gyp +++ b/third_party/harfbuzz/harfbuzz.gyp @@ -12,7 +12,7 @@ 'targets': [ { 'target_name': 'harfbuzz', - 'type': 'static_library', + 'type': '<(library)', 'sources': [ 'src/harfbuzz-buffer.c', 'src/harfbuzz-stream.c', @@ -46,7 +46,7 @@ }, { 'target_name': 'harfbuzz_interface', - 'type': 'static_library', + 'type': '<(library)', 'sources': [ 'contrib/harfbuzz-freetype.c', 'contrib/harfbuzz-unicode.c', diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 213009a..4230cb4 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -13,7 +13,7 @@ { 'target_name': 'libevent', 'product_name': 'event', - 'type': 'static_library', + 'type': '<(library)', 'sources': [ 'buffer.c', 'evbuffer.c', diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index e29bd41..87f9937 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'libjpeg', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': '238CE175-76CE-4A25-A676-69D115885601', 'sources': [ 'jcapimin.c', diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 83bb907..63bd9d7 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'libpng', - 'type': 'static_library', + 'type': '<(library)', 'dependencies': [ '../zlib/zlib.gyp:zlib', ], diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 3514097..b1b0117 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -31,7 +31,7 @@ ], }, }, { # else: OS != "linux" or ! use_system_libxml - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7', 'sources': [ 'include/libxml/c14n.h', diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 9615e83..f775d4b 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -31,7 +31,7 @@ ], }, }, { # else: OS != "linux" or ! use_system_libxslt - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED', 'sources': [ 'libxslt/attributes.c', diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp index 6b4b75c..18dadd8 100644 --- a/third_party/modp_b64/modp_b64.gyp +++ b/third_party/modp_b64/modp_b64.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'modp_b64', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': '7100F41F-868D-4E99-80A2-AF8E6574749D', 'sources': [ 'modp_b64.cc', diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 800cc18..a725754 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -37,7 +37,7 @@ }, }, { # else: OS != "linux" or ! use_system_sqlite 'product_name': 'sqlite3', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': '6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9', 'sources': [ # This list contains all .h, .c, and .cc files in the directories diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index f59bd46..a2e592e 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'zlib', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C', 'sources': [ 'contrib/minizip/ioapi.c', |