s4-cmdline: make cmdline-credentials a private library

diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index 583ba0b70c62748776c1cf83bd33234cba614bdf..b116e443159924df33fc588f2da15115a09663b5 100644 (file)
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
 
 bld.SAMBA_PYTHON('pycredentials',
        source='pycredentials.c',
-       public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
+       public_deps='CREDENTIALS cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
        realname='samba/credentials.so'
        )
 

diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index d3b457994b7901e8e63ffb738ae6376f9d32f283..f35e0604c73e9c8add96d5ecdc86fb106fee5a75 100644 (file)
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('LIBCMDLINE_CREDENTIALS',
-       source='credentials.c',
-       autoproto='credentials.h',
-       public_deps='CREDENTIALS popt'
-       )
+bld.SAMBA_LIBRARY('cmdline-credentials',
+                  source='credentials.c',
+                  autoproto='credentials.h',
+                  public_deps='CREDENTIALS popt',
+                  private_library=True)
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
        source='popt_common.c',
@@ -17,7 +17,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS',
        source='popt_credentials.c',
        autoproto='popt_credentials.h',
-       public_deps='CREDENTIALS CREDENTIALS_SECRETS LIBCMDLINE_CREDENTIALS popt',
+       public_deps='CREDENTIALS CREDENTIALS_SECRETS cmdline-credentials popt',
        deps='samba-util'
        )
 

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 04aa4e8f9a7d02ff8fef4934745b65bbb2a0bbd4..69b5c453f3e59031a7391e2935eecb83aad9965f 100644 (file)
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -223,7 +223,7 @@ def build(bld):
 
     if s4_build:
         extra_cmdline_deps = ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \
-                'LIBCMDLINE_CREDENTIALS gensec'
+                'cmdline-credentials gensec'
     else:
         extra_cmdline_deps = ''