diff options
| author | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-22 00:56:43 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-22 00:56:43 +0000 |
| commit | d7c127eea478f455f80c57a051cf43c0b9f1a605 (patch) | |
| tree | ea428a15aee248b33f5ac5ff60ca55d00b5062bf /samples | |
| parent | 5505a8bfaa00b6a3c024cad1077c10876c2a80de (diff) | |
| download | gyp-d7c127eea478f455f80c57a051cf43c0b9f1a605.tar.gz | |
r269 brings the product_name keyword and sets product_name for some libraries
to the names they usually use. This takes care of the problem of the extra
"lib" in library names, like "liblibevent.a". Generator support required; this
works for the Xcode generator now and will not harm other generators that are
not yet aware of product_name.
git-svn-id: http://gyp.googlecode.com/svn/trunk@269 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bzip2.gyp | 7 | ||||
| -rw-r--r-- | samples/libevent.gyp | 4 | ||||
| -rw-r--r-- | samples/libjpeg.gyp | 3 | ||||
| -rw-r--r-- | samples/libpng.gyp | 3 | ||||
| -rw-r--r-- | samples/libxml.gyp | 5 | ||||
| -rw-r--r-- | samples/libxslt.gyp | 3 | ||||
| -rw-r--r-- | samples/sqlite.gyp | 1 | ||||
| -rw-r--r-- | samples/zlib.gyp | 8 |
8 files changed, 28 insertions, 6 deletions
diff --git a/samples/bzip2.gyp b/samples/bzip2.gyp index 56d0a564..8b2496d6 100644 --- a/samples/bzip2.gyp +++ b/samples/bzip2.gyp @@ -27,6 +27,13 @@ '.', ], }, + 'conditions': [ + ['OS=="win"', { + 'product_name': 'libbzip2', + }, { # else: OS!="win" + 'product_name': 'bz2', + }], + ], }, ], } diff --git a/samples/libevent.gyp b/samples/libevent.gyp index d44185c0..b452d758 100644 --- a/samples/libevent.gyp +++ b/samples/libevent.gyp @@ -7,8 +7,8 @@ ], 'targets': [ { - 'target_name': 'libevent', # Maybe this should be called "event" so that - # it outputs libevent.a. + 'target_name': 'libevent', + 'product_name': 'event', 'type': 'static_library', 'sources': [ 'buffer.c', diff --git a/samples/libjpeg.gyp b/samples/libjpeg.gyp index 919ad7a3..f190f62f 100644 --- a/samples/libjpeg.gyp +++ b/samples/libjpeg.gyp @@ -71,6 +71,9 @@ '.', ], }, + 'conditions': [ + ['OS!="win"', {'product_name': 'jpeg'}], + ], }, ], } diff --git a/samples/libpng.gyp b/samples/libpng.gyp index 81548b34..b2949fd9 100644 --- a/samples/libpng.gyp +++ b/samples/libpng.gyp @@ -51,6 +51,9 @@ 'export_dependent_settings': [ '../zlib/zlib.gyp:zlib', ], + 'conditions': [ + ['OS!="win"', {'product_name': 'png'}], + ], }, ], } diff --git a/samples/libxml.gyp b/samples/libxml.gyp index 9c10ce44..e7ea7525 100644 --- a/samples/libxml.gyp +++ b/samples/libxml.gyp @@ -151,6 +151,11 @@ }, 'conditions': [ ['OS=="mac"', {'defines': ['_REENTRANT']}], + ['OS=="win"', { + 'product_name': 'libxml2', + }, { # else: OS!="win" + 'product_name': 'xml2', + }], ], }, { diff --git a/samples/libxslt.gyp b/samples/libxslt.gyp index 56273216..379ea5a0 100644 --- a/samples/libxslt.gyp +++ b/samples/libxslt.gyp @@ -81,6 +81,9 @@ '.', ], }, + 'conditions': [ + ['OS!="win"', {'product_name': 'xslt'}], + ], }, ], } diff --git a/samples/sqlite.gyp b/samples/sqlite.gyp index 7cf3db74..3878153c 100644 --- a/samples/sqlite.gyp +++ b/samples/sqlite.gyp @@ -9,6 +9,7 @@ 'targets': [ { 'target_name': 'sqlite', + 'product_name': 'sqlite3', 'type': 'static_library', 'sources': [ # This list contains all .h, .c, and .cc files in the directories diff --git a/samples/zlib.gyp b/samples/zlib.gyp index 04c6b08c..383f974d 100644 --- a/samples/zlib.gyp +++ b/samples/zlib.gyp @@ -50,10 +50,10 @@ ], }, 'conditions': [ - [ 'OS!="win"', { - 'sources/': [['exclude', '^contrib/minizip/']] - } - ], + ['OS!="win"', { + 'product_name': 'z', + 'sources/': [['exclude', '^contrib/minizip/']], + }], ], }, ], |