waf: Rename some BUNDLED_ functios to PRIVATE_.

[nivanova/samba-autobuild/.git] / buildtools / wafsamba / wscript

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index e2b1a278ddebd2dbc5136246c3a262cd04cea533..d705216ba7530942719a9b804d98d749a5dc7cc3 100644 (file)
--- 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',
@@ -100,6 +100,14 @@ def set_options(opt):
                   help=("Update ABI signature files for libraries"),
                   action='store_true', dest='ABI_UPDATE', default=False)
 
+    gr.add_option('--show-deps',
+                  help=("Show dependency tree for the given target"),
+                  dest='SHOWDEPS', default='')
+
+    gr.add_option('--show-duplicates',
+                  help=("Show objects which are included in multiple binaries or libraries"),
+                  action='store_true', dest='SHOW_DUPLICATES', default=False)
+
     gr = opt.add_option_group('cross compilation options')
 
     gr.add_option('--cross-compile',
@@ -194,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
@@ -280,7 +288,12 @@ def configure(conf):
     if 'HAVE_SYS_TIME_H' in conf.env and 'HAVE_TIME_H' in conf.env:
         conf.DEFINE('TIME_WITH_SYS_TIME', 1)
 
-    conf.define('SHLIBEXT', "so", quote=True)
+    # cope with different extensions for libraries
+    (root, ext) = os.path.splitext(conf.env.shlib_PATTERN)
+    if ext[0] == '.':
+        conf.define('SHLIBEXT', ext[1:], quote=True)
+    else:
+        conf.define('SHLIBEXT', "so", quote=True)
 
     conf.CHECK_CODE('long one = 1; return ((char *)(&one))[0]',
                     execute=True,