diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 23:26:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 22:24:06 +0000 |
| commit | 49ef2888193dd7cc37c3fe0a980b7cc1abdac805 (patch) | |
| tree | 2d93d741f0a89b389ecb78f511499ca4f620555c /buildtools/wafsamba/wscript | |
| parent | 18103d34e2e965ac77ab023f12caa967c655765a (diff) | |
| download | samba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.tar.gz samba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.tar.bz2 samba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.zip | |
waf: Rename some BUNDLED_ functios to PRIVATE_.
Diffstat (limited to 'buildtools/wafsamba/wscript')
| -rw-r--r-- | buildtools/wafsamba/wscript | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 9dc6910fda..d705216ba7 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -27,15 +27,15 @@ def set_options(opt): help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"), action="store", dest='BUNDLED_LIBS', default='') - extension_default = Options.options['BUNDLED_EXTENSION_DEFAULT'] - gr.add_option('--bundled-library-extension', - help=("name extension for bundled libraries [%s]" % extension_default), - action="store", dest='BUNDLED_EXTENSION', default=extension_default) + extension_default = Options.options['PRIVATE_EXTENSION_DEFAULT'] + gr.add_option('--private-library-extension', + help=("name extension for private libraries [%s]" % extension_default), + action="store", dest='PRIVATE_EXTENSION', default=extension_default) - extension_exception = Options.options['BUNDLED_EXTENSION_EXCEPTION'] - gr.add_option('--bundled-extension-exception', - help=("comman separated list of libraries to not apply extension to [%s]" % extension_exception), - action="store", dest='BUNDLED_EXTENSION_EXCEPTION', default=extension_exception) + extension_exception = Options.options['PRIVATE_EXTENSION_EXCEPTION'] + gr.add_option('--private-extension-exception', + help=("comma separated list of libraries to not apply extension to [%s]" % extension_exception), + action="store", dest='PRIVATE_EXTENSION_EXCEPTION', default=extension_exception) builtin_defauilt = Options.options['BUILTIN_LIBRARIES_DEFAULT'] gr.add_option('--builtin-libraries', @@ -202,8 +202,8 @@ def configure(conf): conf.env.DISABLE_SHARED = Options.options.disable_shared conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',') - conf.env.BUNDLED_EXTENSION = Options.options.BUNDLED_EXTENSION - conf.env.BUNDLED_EXTENSION_EXCEPTION = Options.options.BUNDLED_EXTENSION_EXCEPTION.split(',') + conf.env.PRIVATE_EXTENSION = Options.options.PRIVATE_EXTENSION + conf.env.PRIVATE_EXTENSION_EXCEPTION = Options.options.PRIVATE_EXTENSION_EXCEPTION.split(',') conf.env.CROSS_COMPILE = Options.options.CROSS_COMPILE conf.env.CROSS_EXECUTE = Options.options.CROSS_EXECUTE |