s4: Drop duplicate 'lib' prefix for private libraries.

diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index b758248763cc16f4e5b36ce751bcc48fb18ca51b..4719ba79c6859f02a36c7fd9375639d1e6dd9a75 100644 (file)
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_LIBRARY('torture',
        source='torture.c subunit.c',
        vnum='0.0.1',
        pc_files='torture.pc',
        source='torture.c subunit.c',
        vnum='0.0.1',
        pc_files='torture.pc',

-       public_deps='libsamba-hostconfig libsamba-util libsamba-errors talloc tevent subunit',
+       public_deps='libsamba-hostconfig libsamba-util errors talloc tevent subunit',

        public_headers='torture.h'
        )
        public_headers='torture.h'
        )

diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index d9030c040e2189a8e1b6b3d702ceac6bf0e53ba6..4d8ebcd6cf12d0470238a1780626da94b0645eb8 100644 (file)
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
        source='ldap_message.c',
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
        source='ldap_message.c',

-       public_deps='libsamba-errors talloc ldb',
+       public_deps='errors talloc ldb',

        public_headers='ldap_message.h ldap_errors.h',
        deps='libsamba-util ASN1_UTIL'
        )
        public_headers='ldap_message.h ldap_errors.h',
        deps='libsamba-util ASN1_UTIL'
        )


@@ -10,7 +10,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
        source='ldap_ndr.c',
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
        source='ldap_ndr.c',

-       public_deps='libsamba-errors talloc',
+       public_deps='errors talloc',

        public_headers='ldap_ndr.h',
        deps='libsamba-util ldb NDR_SECURITY tevent'
        )
        public_headers='ldap_ndr.h',
        deps='libsamba-util ldb NDR_SECURITY tevent'
        )

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index ec2b4730331e90deb9028783a0826eae84117ed9..eb1736932a7599c2e409f0a254cd1c2d6d40463e 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('cli_nbt',
 bld.SAMBA_BINARY('nmblookup',
        source='tools/nmblookup.c',
        manpages='man/nmblookup.1',
 bld.SAMBA_BINARY('nmblookup',
        source='tools/nmblookup.c',
        manpages='man/nmblookup.1',

-       deps='libsamba-hostconfig libsamba-util cli_nbt popt POPT_SAMBA libnetif LIBCLI_RESOLVE'
+       deps='libsamba-hostconfig libsamba-util cli_nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'

        )
 
 
        )
 
 

diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index ddf679c1419dca27f2146886791968626b5d095e..f3b03255428e03becc40caba40185584c78d1fae 100644 (file)
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
 #!/usr/bin/env python
 
 

-bld.SAMBA_LIBRARY('libsecurity',
+bld.SAMBA_LIBRARY('security',

                   source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c',
                   private_library=True,
                   deps='talloc LIBNDR NDR_SECURITY'
                   source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c',
                   private_library=True,
                   deps='talloc LIBNDR NDR_SECURITY'

diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index e2fe711110140c8bee532eb00d79e09a3675f804..e2422c566b68e6bda37cb01e9e28516830bb0ef4 100644 (file)
--- a/libgpo/wscript_build
+++ b/libgpo/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
        source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c ../source4/libgpo/gpo_filesync.c',
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
        source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c ../source4/libgpo/gpo_filesync.c',

-       deps='ldb libsamba-net',
-        enabled=False
+       deps='ldb samba-net',
+       enabled=False

        )
 
        )
 

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 81240530fc82e74005b6e213c55e976dcead6f7c..6e73a3d971bbd4f32e3d00a8db4a550ffe991b80 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -249,7 +249,7 @@ bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
 
 bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
        source='../librpc/ndr/ndr_compression.c',
 
 bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
        source='../librpc/ndr/ndr_compression.c',

-       public_deps='libsamba-errors LIBNDR',
+       public_deps='errors LIBNDR',

        deps='ZLIB LZXPRESS'
        )
 
        deps='ZLIB LZXPRESS'
        )
 

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 6837f5ec531a7b6fdf4f355e3df77093442f1792..5146ed95c4e0a4b6b0a184d371ccdc906c63bf4c 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -16,7 +16,7 @@ bld.SAMBA_BINARY('nsstest',
 
 bld.SAMBA_BINARY('wbinfo',
        source='wbinfo.c',
 
 bld.SAMBA_BINARY('wbinfo',
        source='wbinfo.c',

-       deps='libsamba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ libsecurity LIBNDR NDR_SECURITY'
+       deps='libsamba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security LIBNDR NDR_SECURITY'

        )
 
 bld.SAMBA_LIBRARY('nss_winbind',
        )
 
 bld.SAMBA_LIBRARY('nss_winbind',

diff --git a/source3/wscript_build b/source3/wscript_build
index 6a30e83dc3c62b58bbdbb5aac40b8444411eebd9..7068c616210174621c5ea9efd6cdb8ea2339b41f 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1019,7 +1019,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,

-                    deps='iconv LIBCRYPTO LIBNDR libsecurity NDR_SECURITY charset NDR_MESSAGING',
+                    deps='iconv LIBCRYPTO LIBNDR security NDR_SECURITY charset NDR_MESSAGING',

                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',

diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index 14ba67b7206e29bbbf3e393c6937e9627bba0958..554b6ce76031c016a35882406a5ebaba211fcb78 100644 (file)
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS',
        source='credentials.c',
        autoproto='credentials_proto.h',
        public_headers='credentials.h',
        source='credentials.c',
        autoproto='credentials_proto.h',
        public_headers='credentials.h',

-       deps='LIBCRYPTO libsamba-errors libevents LIBCLI_AUTH libsecurity',
+       deps='LIBCRYPTO errors events LIBCLI_AUTH security',

        )
 
 bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
        )
 
 bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 679c8130eb4e838d72ae03ee91492bb9c05beac3..7f4a9eee07b2a01622a3f96583df141129073fcc 100644 (file)
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('gensec',
        source='gensec.c socket.c gensec_tstream.c',
        pc_files='gensec.pc',
        autoproto='gensec_proto.h',
        source='gensec.c socket.c gensec_tstream.c',
        pc_files='gensec.pc',
        autoproto='gensec_proto.h',

-       public_deps='UTIL_TEVENT libsamba-util libsamba-errors LIBPACKET auth_system_session',
+       public_deps='UTIL_TEVENT libsamba-util errors LIBPACKET auth_system_session',

        public_headers='gensec.h',
        deps='com_err',
        vnum='0.0.1'
        public_headers='gensec.h',
        deps='com_err',
        vnum='0.0.1'

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index bbb47d78815e98fc0a69dd08b545b8f400acfbfb..c7e9a899cfefb0eba8e62a6652303ecd12d44ebb 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -55,7 +55,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
 bld.SAMBA_LIBRARY('auth',
        source='auth.c auth_util.c auth_simple.c',
        autoproto='auth_proto.h',
 bld.SAMBA_LIBRARY('auth',
        source='auth.c auth_util.c auth_simple.c',
        autoproto='auth_proto.h',

-       deps='libsamba-util libsecurity SAMDB CREDENTIALS UTIL_TEVENT',
+       deps='libsamba-util security SAMDB CREDENTIALS UTIL_TEVENT',

        private_library=True
        )
 
        private_library=True
        )
 

diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index 03812f51856e3485a23d794e83acaeb8966dd35c..eb24459c3cfa6039557cc22f4f238c4d103fc309 100644 (file)
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session',
 bld.SAMBA_SUBSYSTEM('auth_sam',
        source='sam.c',
        autoproto='auth_sam.h',
 bld.SAMBA_SUBSYSTEM('auth_sam',
        source='sam.c',
        autoproto='auth_sam.h',

-       public_deps='SAMDB libsecurity ldb tevent',
+       public_deps='SAMDB security ldb tevent',

        deps=''
        )
 
        deps=''
        )
 

diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
index fbf3c7e1283a84d5bb9965ba672a7264bb21ae6a..ce586dcc6198c3d66231c9cf906c425452575228 100644 (file)
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('service_cldap',
        source='cldap_server.c',
        subsystem='service',
        init_function='server_service_cldapd_init',
        source='cldap_server.c',
        subsystem='service',
        init_function='server_service_cldapd_init',

-       deps='CLDAPD process_model libnetif'
+       deps='CLDAPD process_model netif'

        )
 
 
        )
 
 

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 16be427d232a3d07de66ab829dae90ca3fd694f7..b7a44ecf4fff7c8d5052ae4b1bf8de2068e6aebd 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('dsdb_module',
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
        source='util.c acl_util.c schema_util.c',
        autoproto='util_proto.h',
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
        source='util.c acl_util.c schema_util.c',
        autoproto='util_proto.h',

-       deps='ldb LIBNDR samdb_common libsecurity_session'
+       deps='ldb LIBNDR samdb_common security_session'

        )
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
        )
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',


@@ -28,7 +28,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
        source='samba_dsdb.c',
        subsystem='ldb',
        init_function='LDB_MODULE(samba_dsdb)',
        source='samba_dsdb.c',
        subsystem='ldb',
        init_function='LDB_MODULE(samba_dsdb)',

-       deps='SAMDB talloc libevents LIBNDR DSDB_MODULE_HELPERS',
+       deps='SAMDB talloc events LIBNDR DSDB_MODULE_HELPERS',

        internal_module=False,
        )
 
        internal_module=False,
        )
 


@@ -38,7 +38,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
        subsystem='ldb',
        init_function='LDB_MODULE(samba_secrets)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samba_secrets)',
        internal_module=False,

-       deps='SAMDB talloc libevents LIBNDR'
+       deps='SAMDB talloc events LIBNDR'

        )
 
 
        )
 
 


@@ -47,7 +47,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
        subsystem='ldb',
        init_function='LDB_MODULE(objectguid)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(objectguid)',
        internal_module=False,

-       deps='SAMDB talloc libevents LIBNDR'
+       deps='SAMDB talloc events LIBNDR'

        )
 
 
        )
 
 


@@ -56,7 +56,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
        subsystem='ldb',
        init_function='LDB_MODULE(repl_meta_data)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(repl_meta_data)',
        internal_module=False,

-       deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS libsecurity_session'
+       deps='SAMDB talloc events LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS security_session'

        )
 
 
        )
 
 


@@ -65,7 +65,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache',
        subsystem='ldb',
        init_function='LDB_MODULE(dsdb_cache)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(dsdb_cache)',
        internal_module=False,

-       deps='SAMDB talloc libevents'
+       deps='SAMDB talloc events'

        )
 
 
        )
 
 


@@ -74,7 +74,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
        subsystem='ldb',
        init_function='LDB_MODULE(schema_load)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(schema_load)',
        internal_module=False,

-       deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -83,7 +83,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
        subsystem='ldb',
        init_function='LDB_MODULE(schema_data)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(schema_data)',
        internal_module=False,

-       deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -92,7 +92,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
        subsystem='ldb',
        init_function='LDB_MODULE(naming_fsmo)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(naming_fsmo)',
        internal_module=False,

-       deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -101,7 +101,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
        subsystem='ldb',
        init_function='LDB_MODULE(pdc_fsmo)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(pdc_fsmo)',
        internal_module=False,

-       deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -110,7 +110,7 @@ bld.SAMBA_MODULE('ldb_samldb',
        subsystem='ldb',
        init_function='LDB_MODULE(samldb)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samldb)',
        internal_module=False,

-       deps='talloc libevents SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
+       deps='talloc events SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'

        )
 
 
        )
 
 


@@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sam)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sam)',
        internal_module=False,

-       deps='talloc libevents ldb smbpasswd libsecurity NDR_SECURITY'
+       deps='talloc events ldb smbpasswd security NDR_SECURITY'

        )
 
 
        )
 
 


@@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sid)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sid)',
        internal_module=False,

-       deps='talloc libevents ldb libsecurity NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
+       deps='talloc events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -138,7 +138,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
        subsystem='ldb',
        init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
        internal_module=False,

-       deps='talloc libevents ldb LIBNDR LDBSAMBA'
+       deps='talloc events ldb LIBNDR LDBSAMBA'

        )
 
 
        )
 
 


@@ -147,7 +147,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
        subsystem='ldb',
        init_function='LDB_MODULE(rootdse)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(rootdse)',
        internal_module=False,

-       deps='talloc libevents SAMDB MESSAGING libsecurity_session DSDB_MODULE_HELPERS'
+       deps='talloc events SAMDB MESSAGING security_session DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -156,7 +156,7 @@ bld.SAMBA_MODULE('ldb_password_hash',
        subsystem='ldb',
        init_function='LDB_MODULE(password_hash)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(password_hash)',
        internal_module=False,

-       deps='talloc libevents SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err'
+       deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err'

        )
 
 
        )
 
 


@@ -165,7 +165,7 @@ bld.SAMBA_MODULE('ldb_local_password',
        subsystem='ldb',
        init_function='LDB_MODULE(local_password)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(local_password)',
        internal_module=False,

-       deps='talloc libevents LIBNDR SAMDB'
+       deps='talloc events LIBNDR SAMDB'

        )
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',
        )
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',


@@ -173,7 +173,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
        subsystem='ldb',
        init_function='LDB_MODULE(extended_dn_in)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(extended_dn_in)',
        internal_module=False,

-       deps='talloc libevents libsamba-util'
+       deps='talloc events libsamba-util'

        )
 
 
        )
 
 


@@ -181,7 +181,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out',
        source='extended_dn_out.c',
        aliases='ldb_extended_dn_out_ldb ldb_extended_dn_out_openldap ldb_extended_dn_out_fds',
        subsystem='ldb',
        source='extended_dn_out.c',
        aliases='ldb_extended_dn_out_ldb ldb_extended_dn_out_openldap ldb_extended_dn_out_fds',
        subsystem='ldb',

-       deps='talloc libevents LIBNDR libsamba-util SAMDB',
+       deps='talloc events LIBNDR libsamba-util SAMDB',

        internal_module=False,
        init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
        )
        internal_module=False,
        init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
        )


@@ -192,7 +192,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store',
        subsystem='ldb',
        init_function='LDB_MODULE(extended_dn_store)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(extended_dn_store)',
        internal_module=False,

-       deps='talloc libevents libsamba-util SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc events libsamba-util SAMDB DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -201,7 +201,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
        subsystem='ldb',
        init_function='LDB_MODULE(show_deleted)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(show_deleted)',
        internal_module=False,

-       deps='talloc libevents libsamba-util DSDB_MODULE_HELPERS'
+       deps='talloc events libsamba-util DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -211,7 +211,7 @@ bld.SAMBA_MODULE('ldb_partition',
        subsystem='ldb',
        init_function='LDB_MODULE(partition)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(partition)',
        internal_module=False,

-       deps='talloc libevents SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc events SAMDB DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -220,7 +220,7 @@ bld.SAMBA_MODULE('ldb_new_partition',
        subsystem='ldb',
        init_function='LDB_MODULE(new_partition)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(new_partition)',
        internal_module=False,

-       deps='talloc libevents SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc events SAMDB DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -229,7 +229,7 @@ bld.SAMBA_MODULE('ldb_update_keytab',
        subsystem='ldb',
        init_function='LDB_MODULE(update_keytab)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(update_keytab)',
        internal_module=False,

-       deps='talloc libevents CREDENTIALS ldb com_err KERBEROS_UTIL'
+       deps='talloc events CREDENTIALS ldb com_err KERBEROS_UTIL'

        )
 
 
        )
 
 


@@ -238,7 +238,7 @@ bld.SAMBA_MODULE('ldb_objectclass',
        subsystem='ldb',
        init_function='LDB_MODULE(objectclass)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(objectclass)',
        internal_module=False,

-       deps='talloc libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS libsamba-util DSDB_MODULE_HELPER_SCHEMA'
+       deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS libsamba-util DSDB_MODULE_HELPER_SCHEMA'

        )
 
 
        )
 
 


@@ -256,7 +256,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename',
        subsystem='ldb',
        init_function='LDB_MODULE(subtree_rename)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(subtree_rename)',
        internal_module=False,

-       deps='talloc libevents libsamba-util ldb samdb_common'
+       deps='talloc events libsamba-util ldb samdb_common'

        )
 
 
        )
 
 


@@ -265,7 +265,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete',
        subsystem='ldb',
        init_function='LDB_MODULE(subtree_delete)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(subtree_delete)',
        internal_module=False,

-       deps='talloc libevents libsamba-util DSDB_MODULE_HELPERS'
+       deps='talloc events libsamba-util DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -274,7 +274,7 @@ bld.SAMBA_MODULE('ldb_linked_attributes',
        subsystem='ldb',
        init_function='LDB_MODULE(linked_attributes)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(linked_attributes)',
        internal_module=False,

-       deps='talloc libevents SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc events SAMDB DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -283,7 +283,7 @@ bld.SAMBA_MODULE('ldb_ranged_results',
        subsystem='ldb',
        init_function='LDB_MODULE(ranged_results)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(ranged_results)',
        internal_module=False,

-       deps='talloc libevents libsamba-util ldb'
+       deps='talloc events libsamba-util ldb'

        )
 
 
        )
 
 


@@ -292,7 +292,7 @@ bld.SAMBA_MODULE('ldb_anr',
        subsystem='ldb',
        init_function='LDB_MODULE(anr)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(anr)',
        internal_module=False,

-       deps='talloc libevents libsamba-util SAMDB'
+       deps='talloc events libsamba-util SAMDB'

        )
 
 
        )
 
 


@@ -301,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype',
        subsystem='ldb',
        init_function='LDB_MODULE(instancetype)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(instancetype)',
        internal_module=False,

-       deps='talloc libevents libsamba-util SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc events libsamba-util SAMDB DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 


@@ -319,7 +319,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
        subsystem='ldb',
        init_function='LDB_MODULE(descriptor)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(descriptor)',
        internal_module=False,

-       deps='talloc libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+       deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'

        )
 
 
        )
 
 


@@ -328,7 +328,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
        subsystem='ldb',
        init_function='LDB_MODULE(resolve_oids)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(resolve_oids)',
        internal_module=False,

-       deps='SAMDB talloc libevents LIBNDR'
+       deps='SAMDB talloc events LIBNDR'

        )
 
 
        )
 
 


@@ -337,7 +337,7 @@ bld.SAMBA_MODULE('ldb_acl',
        subsystem='ldb',
        init_function='LDB_MODULE(acl)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(acl)',
        internal_module=False,

-       deps='talloc libevents libsecurity SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+       deps='talloc events security SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'

        )
 
 
        )
 
 


@@ -354,7 +354,7 @@ bld.SAMBA_MODULE('ldb_aclread',
        subsystem='ldb',
        init_function='LDB_MODULE(aclread)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(aclread)',
        internal_module=False,

-       deps='talloc libevents libsecurity SAMDB DSDB_MODULE_HELPERS',
+       deps='talloc events security SAMDB DSDB_MODULE_HELPERS',

        )
 
 bld.SAMBA_MODULE('ldb_simple_dn',
        )
 
 bld.SAMBA_MODULE('ldb_simple_dn',

diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build
index 857383a220d268a59cd0b2f40d5a83a7c9941be3..24fbad00ea49661fa1ff13a71be75fc2985eb645 100644 (file)
--- a/source4/lib/com/wscript_build
+++ b/source4/lib/com/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_SUBSYSTEM('COM',
        source='tables.c rot.c main.c',
 
 bld.SAMBA_SUBSYSTEM('COM',
        source='tables.c rot.c main.c',

-       deps='libsamba-util libsamba-hostconfig libevents LIBNDR PIDL_DCOM'
+       deps='libsamba-util libsamba-hostconfig events LIBNDR PIDL_DCOM'

        )
 
 
        )
 
 

diff --git a/source4/lib/events/wscript_build b/source4/lib/events/wscript_build
index 7d8774cfc2cda3acd561b7e2dc496067648e14ae..fa7030b51db422ed582245f0b7eca2ba2f313084 100644 (file)
--- a/source4/lib/events/wscript_build
+++ b/source4/lib/events/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
 #!/usr/bin/env python
 
 

-bld.SAMBA_LIBRARY('libevents',
+bld.SAMBA_LIBRARY('events',

                   source='tevent_s4.c',
                   deps='libsamba-util',
                   public_deps='tevent',
                   source='tevent_s4.c',
                   deps='libsamba-util',
                   public_deps='tevent',

diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index 79e247540497d4b06c65d120f8dba0529b3a582b..5a2dc70330587714089b150abc4077224f602d42 100644 (file)
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA',
        autoproto='ldif_handlers_proto.h',
        public_deps='ldb',
        public_headers='ldb_wrap.h',
        autoproto='ldif_handlers_proto.h',
        public_deps='ldb',
        public_headers='ldb_wrap.h',

-       deps='libsecurity LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB'
+       deps='security LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB'

        )
 
 
        )
 
 

diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
index 7eb26127b6248537fba24dbc8aec4ea03546dfb1..465a90b2644cee18f4e2ce269d4653988e2e5e12 100644 (file)
--- a/source4/lib/messaging/wscript_build
+++ b/source4/lib/messaging/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('MESSAGING',
 
 bld.SAMBA_PYTHON('python_messaging',
        source='pymessaging.c',
 
 bld.SAMBA_PYTHON('python_messaging',
        source='pymessaging.c',

-       deps='MESSAGING libevents pyparam_util',
+       deps='MESSAGING events pyparam_util',

        realname='samba/messaging.so'
        )
 
        realname='samba/messaging.so'
        )
 

diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index 25a700c8c1d435a08d4f563ebdbadc73eabf07cd..6d9d8cac0617581efea717ca541ca83148904c1e 100644 (file)
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_LIBRARY('policy',
        source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c',
        pc_files='policy.pc',
 bld.SAMBA_LIBRARY('policy',
        source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c',
        pc_files='policy.pc',

-       public_deps='ldb libsamba-net',
+       public_deps='ldb samba-net',

        public_headers='policy.h',
        vnum='0.0.1',
        pyembed=True
        public_headers='policy.h',
        vnum='0.0.1',
        pyembed=True

diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
index 7fded7bc88fb64b5ddcf2e288b7c005803c3e3cb..a9afb1013a01162ac6b11119e47548a3faed94d8 100644 (file)
--- a/source4/lib/socket/wscript_build
+++ b/source4/lib/socket/wscript_build
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-bld.SAMBA_LIBRARY('libnetif',
+bld.SAMBA_LIBRARY('netif',

     source='interface.c netif.c',
     autoproto='netif_proto.h',
     deps='libsamba-util',
     source='interface.c netif.c',
     autoproto='netif_proto.h',
     deps='libsamba-util',


@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('libnetif',
 bld.SAMBA_MODULE('socket_ip',
     source='socket_ip.c',
     subsystem='samba_socket',
 bld.SAMBA_MODULE('socket_ip',
     source='socket_ip.c',
     subsystem='samba_socket',

-    deps='libsamba-errors',
+    deps='errors',

     internal_module=True
     )
 
     internal_module=True
     )
 

diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index ea7c785cdfc6665bc6f469740e17ec8fc1173e14..7f46c76651d13cd2b47ec472ba96ba246c9a8e9f 100644 (file)
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_LIBRARY('cli_ldap',
                   source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
                   autoproto='ldap_proto.h',
 bld.SAMBA_LIBRARY('cli_ldap',
                   source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
                   autoproto='ldap_proto.h',

-                  public_deps='libsamba-errors tevent LIBPACKET',
+                  public_deps='errors tevent LIBPACKET',

                   public_headers='libcli_ldap.h:ldap-util.h',
                   deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE',
                   private_library=True
                   public_headers='libcli_ldap.h:ldap-util.h',
                   deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE',
                   private_library=True

diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
index a24977c23bbf6336c0e14b87a9a5fb9d18d24e47..a39abf5c8ebaee696ae41ee61bf8345aee5424e6 100644 (file)
--- a/source4/libcli/security/wscript_build
+++ b/source4/libcli/security/wscript_build
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-bld.SAMBA_LIBRARY('libsecurity_session',
+bld.SAMBA_LIBRARY('security_session',

        source='session.c',
        autoproto='session_proto.h',
        source='session.c',
        autoproto='session_proto.h',

-       public_deps='libsecurity',
+       public_deps='security',

        private_library=True
        )
 
        private_library=True
        )
 

diff --git a/source4/libcli/wbclient/wscript_build b/source4/libcli/wbclient/wscript_build
index 3509d3efdc101301ec205e23b742433ceaacdee9..8451ca349007de3a9331e415593a22757b610cd7 100644 (file)
--- a/source4/libcli/wbclient/wscript_build
+++ b/source4/libcli/wbclient/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD',
        source='wbclient.c',
 
 bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD',
        source='wbclient.c',

-       public_deps='libsamba-errors libevents',
+       public_deps='errors events',

        deps='NDR_WINBIND MESSAGING RPC_NDR_WINBIND'
        )
 
        deps='NDR_WINBIND MESSAGING RPC_NDR_WINBIND'
        )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index bc7a1a9cbcc112f7555e2d45c095b299ccdd0e5f..8c51ffc2572e97408e4a285e142050ec156b82a4 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,7 +4,7 @@ bld.RECURSE('ldap')
 bld.RECURSE('security')
 bld.RECURSE('wbclient')
 
 bld.RECURSE('security')
 bld.RECURSE('wbclient')
 

-bld.SAMBA_LIBRARY('libsamba-errors',
+bld.SAMBA_LIBRARY('errors',

                   source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
                   public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
                   header_path='core',
                   source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
                   public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
                   header_path='core',


@@ -23,14 +23,14 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
        source='util/clilsa.c',
        autoproto='util/clilsa.h',
        public_deps='RPC_NDR_LSA',
        source='util/clilsa.c',
        autoproto='util/clilsa.h',
        public_deps='RPC_NDR_LSA',

-       deps='libsecurity'
+       deps='security'

        )
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE',
        source='composite/composite.c',
        autoproto='composite/proto.h',
        )
 
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE',
        source='composite/composite.c',
        autoproto='composite/proto.h',

-       public_deps='libevents'
+       public_deps='events'

        )
 
 
        )
 
 


@@ -51,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM',
 bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL',
        source='wrepl/winsrepl.c',
        autoproto='wrepl/winsrepl_proto.h',
 bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL',
        source='wrepl/winsrepl.c',
        autoproto='wrepl/winsrepl_proto.h',

-       public_deps='NDR_WINSREPL samba_socket libevents LIBPACKET LIBSAMBA_TSOCKET'
+       public_deps='NDR_WINSREPL samba_socket events LIBPACKET LIBSAMBA_TSOCKET'

        )
 
 
        )
 
 


@@ -65,7 +65,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
 bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
        source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c',
        autoproto='resolve/lp_proto.h',
 bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
        source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c',
        autoproto='resolve/lp_proto.h',

-       deps='cli_nbt libsamba-hostconfig libnetif'
+       deps='cli_nbt libsamba-hostconfig netif'

        )
 
 
        )
 
 


@@ -79,7 +79,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
        autoproto='libcli_proto.h',
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
        autoproto='libcli_proto.h',

-       public_deps='LIBCLI_RAW libsamba-errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli_nbt libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+       public_deps='LIBCLI_RAW errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli_nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'

        )
 
 
        )
 
 


@@ -87,7 +87,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RAW',
        source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON',
        source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON',

-       deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE libsecurity LIBNDR'
+       deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE security LIBNDR'

        )
 
 bld.RECURSE('smb2')
        )
 
 bld.RECURSE('smb2')

diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index 1449ed579c8af0def18d2d985cc5c97242b128ee..48d64abfaf8c61e6f646db81b7ada0de0b33c3e8 100644 (file)
--- a/source4/libnet/wscript_build
+++ b/source4/libnet/wscript_build
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-bld.SAMBA_LIBRARY('libsamba-net',
+bld.SAMBA_LIBRARY('samba-net',

        source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c',
        autoproto='libnet_proto.h',
        public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err',
        source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c',
        autoproto='libnet_proto.h',
        public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err',


@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('libsamba-net',
 
 bld.SAMBA_PYTHON('python_net',
        source='py_net.c',
 
 bld.SAMBA_PYTHON('python_net',
        source='py_net.c',

-       deps='libsamba-net pyrpc_util',
+       deps='samba-net pyrpc_util',

        realname='samba/net.so'
        )
 
        realname='samba/net.so'
        )
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 56e8f77af2efa9a3f34e28ef96ff488f0fee7326..4a85864ac857197e0959fc2d824caadd3b65fe0e 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -6,7 +6,7 @@ bld.RECURSE('idl')
 bld.SAMBA_LIBRARY('LIBNDR',
        source='../../librpc/ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
        pc_files='../../librpc/ndr.pc',
 bld.SAMBA_LIBRARY('LIBNDR',
        source='../../librpc/ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
        pc_files='../../librpc/ndr.pc',

-       public_deps='libsamba-errors talloc libsamba-util CHARSET',
+       public_deps='errors talloc libsamba-util CHARSET',

        public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h',
        header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ],
        depends_on='PIDL_MISC',
        public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h',
        header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ],
        depends_on='PIDL_MISC',


@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('LIBNDR',
 bld.SAMBA_BINARY('ndrdump',
        source='../../librpc/tools/ndrdump.c',
        manpages='../../librpc/tools/ndrdump.1',
 bld.SAMBA_BINARY('ndrdump',
        source='../../librpc/tools/ndrdump.c',
        manpages='../../librpc/tools/ndrdump.1',

-       deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA ndr_table libsamba-errors'
+       deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA ndr_table errors'

        )
 
 
        )
 
 


@@ -98,7 +98,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD',
        pc_files='../../librpc/ndr_standard.pc',
        deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
        NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
        pc_files='../../librpc/ndr_standard.pc',
        deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
        NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG

-       NDR_ECHO libsecurity NDR_DNS''',
+       NDR_ECHO security NDR_DNS''',

        public_deps='LIBNDR',
        public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
        header_path='gen_ndr'
        public_deps='LIBNDR',
        public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
        header_path='gen_ndr'

diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index a844cd58701d01648eb4ff2e000bddfa4459f88a..594bc5aab46362b437f097c850cba82dfd1c55f5 100644 (file)
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_MODULE('ldb_wins_ldb',
        source='wins/wins_ldb.c',
        subsystem='ldb',
        init_function='LDB_MODULE(wins_ldb)',
        source='wins/wins_ldb.c',
        subsystem='ldb',
        init_function='LDB_MODULE(wins_ldb)',

-       deps='ldb libnetif libsamba-hostconfig libsamba-util',
+       deps='ldb netif libsamba-hostconfig libsamba-util',

        internal_module=False,
        )
 
        internal_module=False,
        )
 

diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build
index 2426452875a3ba940bea697db9603f2db312cbae..105209b94d933c20c49933f09618b67f828ec07a 100644 (file)
--- a/source4/ntvfs/sysdep/wscript_build
+++ b/source4/ntvfs/sysdep/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('sys_notify_inotify',
                  source='inotify.c',
                  subsystem='sys_notify',
                  init_function='sys_notify_inotify_init',
                  source='inotify.c',
                  subsystem='sys_notify',
                  init_function='sys_notify_inotify_init',

-                 deps='libevents',
+                 deps='events',

                  enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY')
                  )
 
                  enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY')
                  )
 

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 87b209f235bd46930be49266765820c173cf0ed7..35b723584ee9bf49503d704b3c254d716baed3bd 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -60,7 +60,7 @@ bld.SAMBA_SUBSYSTEM('pyparam_util',
        pyext=True,
        )
 
        pyext=True,
        )
 

-bld.SAMBA_LIBRARY('libshares',
+bld.SAMBA_LIBRARY('shares',

                   source=[],
                   deps='share share_classic share_ldb',
                   grouping_library=True,
                   source=[],
                   deps='share share_classic share_ldb',
                   grouping_library=True,

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index a8a2ca5a3f2baac87342ef0bf6c9a96315338812..a7303d118de0198b88d6ce29e9e6d4784772cf5b 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('dcerpc_rpcecho',
        source='echo/rpc_echo.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_rpcecho_init',
        source='echo/rpc_echo.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_rpcecho_init',

-       deps='NDR_STANDARD libevents'
+       deps='NDR_STANDARD events'

        )
 
 
        )
 
 


@@ -77,7 +77,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
        source='winreg/rpc_winreg.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_winreg_init',
        source='winreg/rpc_winreg.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_winreg_init',

-       deps='registry NDR_STANDARD libsecurity_session',
+       deps='registry NDR_STANDARD security_session',

        internal_module=True
        )
 
        internal_module=True
        )
 


@@ -95,7 +95,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        autoproto='lsa/proto.h',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_lsa_init',
        autoproto='lsa/proto.h',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_lsa_init',

-       deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP com_err libsecurity_session'
+       deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP com_err security_session'

        )
 
 
        )
 
 


@@ -112,7 +112,7 @@ bld.SAMBA_MODULE('dcerpc_drsuapi',
        source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_drsuapi_init',
        source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_drsuapi_init',

-       deps='SAMDB DCERPC_COMMON NDR_DRSUAPI libsecurity_session'
+       deps='SAMDB DCERPC_COMMON NDR_DRSUAPI security_session'

        )
 
 
        )
 
 

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 92215315af131a7a28065cd45f403fd025e15556..3587c5a502872c204411ef73db58c80697650d43 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -33,7 +33,7 @@ bld.SAMBA_PYTHON('python_uuid',
 
 bld.SAMBA_PYTHON('python_glue',
        source='pyglue.c',
 
 bld.SAMBA_PYTHON('python_glue',
        source='pyglue.c',

-       deps='pyparam_util libsamba-util libnetif PYTALLOC',
+       deps='pyparam_util libsamba-util netif PYTALLOC',

        realname='samba/_glue.so'
        )
 
        realname='samba/_glue.so'
        )
 

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 46ec768d4389e66485371f228bebb39ead4240db..b21879ddb5129284550d8297be7990a95d2c27be 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -18,7 +18,7 @@ bld.SAMBA_BINARY('samba',
        source='server.c',
        manpages='samba.8',
        subsystem_name='service',
        source='server.c',
        manpages='samba.8',
        subsystem_name='service',

-       deps='''libevents process_model service libsamba-hostconfig libsamba-util POPT_SAMBA PIDFILE
+       deps='''events process_model service libsamba-hostconfig libsamba-util POPT_SAMBA PIDFILE

                 popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB SECRETS''',
        pyembed=True,
        install_path='${SBINDIR}'
                 popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB SECRETS''',
        pyembed=True,
        install_path='${SBINDIR}'


@@ -39,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard',
        source='process_standard.c',
        subsystem='process_model',
        init_function='process_model_standard_init',
        source='process_standard.c',
        subsystem='process_model',
        init_function='process_model_standard_init',

-       deps='libevents LDBSAMBA'
+       deps='events LDBSAMBA'

        )
 
 
        )
 
 


@@ -56,14 +56,14 @@ bld.SAMBA_MODULE('process_model_prefork',
        source='process_prefork.c',
        subsystem='process_model',
        init_function='process_model_prefork_init',
        source='process_prefork.c',
        subsystem='process_model',
        init_function='process_model_prefork_init',

-       deps='libevents'
+       deps='events'

        )
 
 bld.SAMBA_MODULE('process_model_onefork',
        source='process_onefork.c',
        subsystem='process_model',
        init_function='process_model_onefork_init',
        )
 
 bld.SAMBA_MODULE('process_model_onefork',
        source='process_onefork.c',
        subsystem='process_model',
        init_function='process_model_onefork_init',

-       deps='libevents'
+       deps='events'

        )
 
 
        )
 
 

diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index aa2ad7328e5fea51586499ace8f00007baf884fe..8d17a12804a6b36b94a3d2da48f2d7ba87249103 100644 (file)
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_drs_init',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_drs_init',

-       deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER libsamba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',
+       deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',

        internal_module=True
        )
 
        internal_module=True
        )
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 0b3e64bd7334280bd2f0f409e8bc3ee05b506a05..be420a169d46da91eec7067f83cd146c6fadd7d1 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
        autoproto='rpc/proto.h',
        subsystem='smbtorture',
        init_function='torture_rpc_init',
        autoproto='rpc/proto.h',
        subsystem='smbtorture',
        init_function='torture_rpc_init',

-       deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER libsamba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
+       deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',

        internal_module=True
        )
 
        internal_module=True
        )
 


@@ -124,7 +124,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
        autoproto='libnet/proto.h',
        subsystem='smbtorture',
        init_function='torture_net_init',
        autoproto='libnet/proto.h',
        subsystem='smbtorture',
        init_function='torture_net_init',

-       deps='libsamba-net POPT_CREDENTIALS torture_rpc PROVISION',
+       deps='samba-net POPT_CREDENTIALS torture_rpc PROVISION',

        internal_module=True
        )
 
        internal_module=True
        )
 

diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index 772795f07ec345859361279b74ec4dc505dfdb92..62f1621d649ffde419685122899fad7a08e1d7b0 100644 (file)
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -12,7 +12,7 @@ bld.SAMBA_MODULE('net_drs',
 bld.SAMBA_BINARY('net',
        source='net.c net_password.c net_vampire.c net_gpo.c',
        autoproto='net_proto.h',
 bld.SAMBA_BINARY('net',
        source='net.c net_password.c net_vampire.c net_gpo.c',
        autoproto='net_proto.h',

-       deps='libsamba-hostconfig libsamba-util libsamba-net popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth',
+       deps='libsamba-hostconfig libsamba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth',

        pyembed=True
        )
 
        pyembed=True
        )
 

diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index e22ec43f85080e91616e36ef84ae6f94900a2739..1565855660ef40cc83c2fd5610bba29af6f27dac 100644 (file)
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_BINARY('ntlm_auth',
        source='ntlm_auth.c',
        manpages='man/ntlm_auth.1',
 bld.SAMBA_BINARY('ntlm_auth',
        source='ntlm_auth.c',
        manpages='man/ntlm_auth.1',

-       deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING libevents service',
+       deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING events service',

        pyembed=True
        )
 
        pyembed=True
        )
 

diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index ab8588979fbdaae10cd93ba0a392833273268fdf..263c0651839fb3247054a8e3297cc35e57f9e49b 100644 (file)
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('WINBIND',
        autoproto='wb_proto.h',
        subsystem='service',
        init_function='server_service_winbind_init',
        autoproto='wb_proto.h',
        subsystem='service',
        init_function='server_service_winbind_init',

-       deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS cli_ldap libsamba-net LIBSAMBA_TSOCKET'
+       deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS cli_ldap samba-net LIBSAMBA_TSOCKET'

        )
 
 
        )