r18213: don't list LIBREPLACE depdendecies explicit and

always at it as first private dependencies

metze
(This used to be commit 135d096776b53ae09ffc2b4f767dfbd18139570f)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index fa09f1c80ef0fd78b1d285d876d31e5aaf33bd36..d692115321ddf1bc0e7d1bcd3cd6f19caf452af6 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -55,7 +55,7 @@ OBJ_FILES = auth_developer.o
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
 OBJ_FILES = auth_unix.o
-PUBLIC_DEPENDENCIES = CRYPT PAM PAM_ERRORS LIBREPLACE
+PUBLIC_DEPENDENCIES = CRYPT PAM PAM_ERRORS
 # End MODULE auth_unix
 #######################
 

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index a8f5485a35262078a6dbbfba090e710c9207f06e..227b47c0c71a4fcfd3bc03b7110009daf81de93b 100644 (file)
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -41,11 +41,15 @@ sub add_libreplace($)
                return if ($n eq "LIBREPLACE");
                return if ($n eq "LIBREPLACE_HOSTCC");
        }
+       foreach my $n (@{$part->{PUBLIC_DEPENDENCIES}}) {
+               return if ($n eq "LIBREPLACE");
+               return if ($n eq "LIBREPLACE_HOSTCC");
+       }
 
        if (defined($part->{USE_HOSTCC}) && $part->{USE_HOSTCC} eq "YES") {
-               push (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE_HOSTCC");
+               unshift (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE_HOSTCC");
        } else {
-               push (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE");
+               unshift (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE");
        }
 }
 

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 1443d8733813faacf0b2c50db1f97ddc438a195e..ed94b17e555e2a05e6b1447d77a90d8ab6df42bb 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -355,7 +355,6 @@ PUBLIC_DEPENDENCIES = \
                        HEIMDAL_ROKEN_GETPROGNAME \
                        GAI \
                        NSL \
-                       LIBREPLACE \
                        RESOLV \
                        EXT_SOCKET
 # End SUBSYSTEM HEIMDAL_ROKEN

diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index b4ed37f705a2528b8a6a9e06d0c51a684e5ac887..67703fbc37ef5944907920a8dc7fb04ca1839ef6 100644 (file)
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -7,6 +7,6 @@ OBJ_FILES = \
                util_unistr.o
 PUBLIC_HEADERS = charset.h
 PUBLIC_PROTO_HEADER = charset_proto.h
-PUBLIC_DEPENDENCIES = ICONV LIBREPLACE
+PUBLIC_DEPENDENCIES = ICONV
 # End SUBSYSTEM CHARSET
 ################################################

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 709d818e47d7b924109327a6b82048ae53cbc813..6a23005b8f117cc854a8e2df4a9745f4943240c2 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -177,7 +177,7 @@ OBJ_FILES = \
                common/ldb_controls.o \
                common/qsort.o
 PUBLIC_DEPENDENCIES = \
-               LIBREPLACE LIBTALLOC
+               LIBTALLOC
 MANPAGE = man/ldb.3
 PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
 #

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 599fade97f8bac9e673052bf01206a61674639aa..89a77c231ead14b8f4808461dc26b877641bb55a 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -34,7 +34,6 @@ INIT_FUNCTION = registry_w95_init
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_w95.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End MODULE registry_w95
 ################################################
 
@@ -99,7 +98,7 @@ OBJ_FILES = \
                reg_samba.o \
                patchfile.o
 PUBLIC_DEPENDENCIES = \
-               LIBSAMBA-UTIL CHARSET LIBREPLACE
+               LIBSAMBA-UTIL CHARSET
 PRIVATE_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb

diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index a90dc75492ef56b2f164057c278dc2df6d987763..5ec76c13391dcf7dafd26d9d2b9ec408ba048c34 100644 (file)
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -9,6 +9,5 @@ PUBLIC_HEADERS = samba3.h
 OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
                idmap.o winsdb.o samba3.o group.o \
                registry.o secrets.o share_info.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End SUBSYSTEM LIBSAMBA3
 ################################################

diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4
index 29f7ac6e1a8594b91f39033526135d9dc70b5f69..ab85bba438ca7408632df2f441f9d5f759ec641a 100644 (file)
--- a/source4/lib/smbreadline/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -79,10 +79,10 @@ AC_MSG_CHECKING(whether to use extern readline)
 if test x"$EXTERNAL_READLINE" = x"yes"; then
        AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE LIBREPLACE])
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE])
        SMB_EXT_LIB(READLINE, [${TERMLIBS}])
        SMB_ENABLE(READLINE,YES)
 else
-       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [LIBREPLACE])
+       SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [])
        AC_MSG_RESULT(no)
 fi

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 5799eb86f8d8a89a95e1140f666667ba92137b7c..a823efb23e5c8dc58ee0d8d50a2aa1c63ba7b65b 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -16,7 +16,7 @@ SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv4.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS 
 # End MODULE socket_ipv4
 ################################################
@@ -28,7 +28,7 @@ SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv6.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_ipv6
 ################################################
 
@@ -39,7 +39,7 @@ SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBREPLACE
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 ################################################
 

diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index 9d38e75341fd659000f84bf6f304bd80ad56c7ea..9e194230dc1ebd63a5e8ec028918783f431dd998 100644 (file)
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -6,6 +6,6 @@ SO_VERSION = 0
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 OBJ_FILES = socket_wrapper.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET LIBREPLACE
+PRIVATE_DEPENDENCIES = EXT_SOCKET
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################

diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index dc523d4ede9747eece93272b2a0730af1b26ddde..3a8a22aa572a4b7d005eeca53726bc1277c30cbc 100644 (file)
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -4,7 +4,6 @@
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = talloc.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 1dbe26428b57a61a0160613e43f5de3d8574db8e..c5d1a3399076d222c821d41e9a4573dc6780de80 100644 (file)
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -9,8 +9,6 @@ OBJ_FILES = \
        common/open.o common/traverse.o common/freelist.o \
        common/error.o common/transaction.o common/tdbutil.o
 CFLAGS = -Ilib/tdb/include
-PUBLIC_DEPENDENCIES = \
-               LIBREPLACE
 PUBLIC_HEADERS = include/tdb.h
 #
 # End SUBSYSTEM ldb

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 9694e8cf6cee6b286d8bc56e7deefd2c4ae21b34..401b4df005d0d62bf944c7ba672c2487743ed888 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -28,18 +28,16 @@ OBJ_FILES = xfile.o \
                idtree.o \
                module.o
 PUBLIC_DEPENDENCIES = \
-               LIBREPLACE LIBCRYPTO LIBTALLOC \
+               LIBCRYPTO LIBTALLOC \
                SOCKET_WRAPPER EXT_NSL
 
 [SUBSYSTEM::PIDFILE]
 PRIVATE_PROTO_HEADER = pidfile.h
 OBJ_FILES = pidfile.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
 OBJ_FILES = unix_privs.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 ################################################
 # Start SUBSYSTEM WRAP_XATTR
@@ -47,7 +45,7 @@ PUBLIC_DEPENDENCIES = LIBREPLACE
 PUBLIC_PROTO_HEADER = wrap_xattr.h
 OBJ_FILES = \
                wrap_xattr.o
-PUBLIC_DEPENDENCIES = XATTR LIBREPLACE
+PUBLIC_DEPENDENCIES = XATTR
 #
 # End SUBSYSTEM WRAP_XATTR
 ################################################

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index e43c39cf1b4fc6b1a8269dec4be48da6fc48ae12..5a0b7e14dc911244ff79366a7e8b05ef9ddb57ca 100644 (file)
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -8,6 +8,6 @@ OBJ_FILES = credentials.o \
                smbencrypt.o \
                smbdes.o
 PUBLIC_DEPENDENCIES = \
-               SCHANNELDB MSRPC_PARSE LIBREPLACE
+               SCHANNELDB MSRPC_PARSE
 # End SUBSYSTEM LIBCLI_AUTH
 #################################

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index ccc21d07dfdb01c1ee902a36166feb0fc2b416da..46f3336fd1a61ed80068b1063c52236c9003de9f 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -41,7 +41,6 @@ PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE
 [SUBSYSTEM::NDR_NBT_BUF]
 PRIVATE_PROTO_HEADER = nbt/nbtname.h
 OBJ_FILES = nbt/nbtname.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [SUBSYSTEM::LIBCLI_NBT]
 #VERSION = 0.0.1

diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 2fbd1847ba6f4b283dd50b19591c489dc50babb6..ce1e37dc54b8de33dcc6260739becf6e3f916707 100644 (file)
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -25,7 +25,6 @@ PRIVATE_PROTO_HEADER = simple/proto.h
 OBJ_FILES = \
                simple/vfs_simple.o \
                simple/svfs_util.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End MODULE ntvfs_simple
 ################################################
 
@@ -39,7 +38,6 @@ PRIVATE_PROTO_HEADER = cifs_posix_cli/proto.h
 OBJ_FILES = \
                 cifs_posix_cli/vfs_simple.o \
                 cifs_posix_cli/svfs_util.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End MODULE ntvfs_cifs_posix_cli
 ################################################
 
@@ -75,7 +73,6 @@ SUBSYSTEM = ntvfs
 INIT_FUNCTION = ntvfs_nbench_init 
 OBJ_FILES = \
                nbench/vfs_nbench.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End MODULE ntvfs_nbench
 ################################################
 
@@ -93,7 +90,6 @@ OBJ_FILES = \
                ntvfs_generic.o \
                ntvfs_interface.o \
                ntvfs_util.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 #
 # End SUBSYSTEM NTVFS
 ################################################

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e363e36adf5d0fef95173c12dfb6efeb2fe302b3..ca73ce279a1c67450527b6b29d20949feb532e9b 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -10,7 +10,6 @@ OBJ_FILES = \
 OBJ_FILES = smbcalls_config.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
@@ -32,38 +31,32 @@ PUBLIC_DEPENDENCIES = LIBSAMBA3
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_random
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_datablob
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PUBLIC_DEPENDENCIES = auth
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_string
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_system
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 #######################
 # Start LIBRARY smbcalls
@@ -83,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
                EJS LIBSAMBA-UTIL \
                EJSRPC MESSAGING \
-               LIBSAMBA-NET LIBCLI_SMB LIBPOPT LIBREPLACE \
+               LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
                POPT_CREDENTIALS POPT_SAMBA \
                dcerpc \
                NDR_TABLE

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index b82f856a1453111126a8985ce35b8e40f59d586d..be2d6a1bde9bfeacef5f4b98ee8460387a5cf8bb 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = \
                torture.o 
 PUBLIC_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
-               LIBSAMBA-UTIL LIBREPLACE
+               LIBSAMBA-UTIL
 
 [SUBSYSTEM::TORTURE_UTIL]
 OBJ_FILES = util.o util_smb.o
@@ -98,7 +98,6 @@ include smb2/config.mk
 SUBSYSTEM = torture
 INIT_FUNCTION = torture_misc_init
 OBJ_FILES = misc.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
@@ -198,7 +197,6 @@ PRIVATE_PROTO_HEADER = \
 OBJ_FILES = \
                nbench/nbio.o \
                nbench/nbench.o
-PUBLIC_DEPENDENCIES = LIBREPLACE
 # End MODULE TORTURE_NBENCH
 #################################
 
@@ -260,7 +258,7 @@ OBJ_FILES = \
                libnet/libnet_domain.o
 PUBLIC_DEPENDENCIES = \
                LIBSAMBA-NET \
-               POPT_CREDENTIALS LIBREPLACE
+               POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_NET
 #################################