Author: metze Date: 2006-09-07 10:02:32 +0000 (Thu, 07 Sep 2006) New Revision: 18213
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18213 Log: don't list LIBREPLACE depdendecies explicit and always at it as first private dependencies metze Modified: branches/SAMBA_4_0/source/auth/config.mk branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/lib/charset/config.mk branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/lib/registry/config.mk branches/SAMBA_4_0/source/lib/samba3/config.mk branches/SAMBA_4_0/source/lib/smbreadline/readline.m4 branches/SAMBA_4_0/source/lib/socket/config.mk branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk branches/SAMBA_4_0/source/lib/talloc/config.mk branches/SAMBA_4_0/source/lib/tdb/config.mk branches/SAMBA_4_0/source/lib/util/config.mk branches/SAMBA_4_0/source/libcli/auth/config.mk branches/SAMBA_4_0/source/libcli/config.mk branches/SAMBA_4_0/source/ntvfs/config.mk branches/SAMBA_4_0/source/scripting/ejs/config.mk branches/SAMBA_4_0/source/torture/config.mk Changeset: Modified: branches/SAMBA_4_0/source/auth/config.mk =================================================================== --- branches/SAMBA_4_0/source/auth/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/auth/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -55,7 +55,7 @@ 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 ####################### Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-07 10:02:32 UTC (rev 18213) @@ -41,11 +41,15 @@ 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"); } } Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -355,7 +355,6 @@ HEIMDAL_ROKEN_GETPROGNAME \ GAI \ NSL \ - LIBREPLACE \ RESOLV \ EXT_SOCKET # End SUBSYSTEM HEIMDAL_ROKEN Modified: branches/SAMBA_4_0/source/lib/charset/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/charset/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/charset/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -7,6 +7,6 @@ util_unistr.o PUBLIC_HEADERS = charset.h PUBLIC_PROTO_HEADER = charset_proto.h -PUBLIC_DEPENDENCIES = ICONV LIBREPLACE +PUBLIC_DEPENDENCIES = ICONV # End SUBSYSTEM CHARSET ################################################ Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -177,7 +177,7 @@ 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 # Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -34,7 +34,6 @@ SUBSYSTEM = registry OBJ_FILES = \ reg_backend_w95.o -PUBLIC_DEPENDENCIES = LIBREPLACE # End MODULE registry_w95 ################################################ @@ -99,7 +98,7 @@ 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 Modified: branches/SAMBA_4_0/source/lib/samba3/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/samba3/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/samba3/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -9,6 +9,5 @@ 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 ################################################ Modified: branches/SAMBA_4_0/source/lib/smbreadline/readline.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/smbreadline/readline.m4 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/smbreadline/readline.m4 2006-09-07 10:02:32 UTC (rev 18213) @@ -79,10 +79,10 @@ 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 Modified: branches/SAMBA_4_0/source/lib/socket/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/socket/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/socket/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -16,7 +16,7 @@ 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 @@ 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 @@ 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 ################################################ Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -6,6 +6,6 @@ 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 ############################## Modified: branches/SAMBA_4_0/source/lib/talloc/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/talloc/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -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 Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/tdb/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -9,8 +9,6 @@ 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 Modified: branches/SAMBA_4_0/source/lib/util/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/util/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/lib/util/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -28,18 +28,16 @@ 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_PROTO_HEADER = wrap_xattr.h OBJ_FILES = \ wrap_xattr.o -PUBLIC_DEPENDENCIES = XATTR LIBREPLACE +PUBLIC_DEPENDENCIES = XATTR # # End SUBSYSTEM WRAP_XATTR ################################################ Modified: branches/SAMBA_4_0/source/libcli/auth/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/auth/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/libcli/auth/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -8,6 +8,6 @@ smbencrypt.o \ smbdes.o PUBLIC_DEPENDENCIES = \ - SCHANNELDB MSRPC_PARSE LIBREPLACE + SCHANNELDB MSRPC_PARSE # End SUBSYSTEM LIBCLI_AUTH ################################# Modified: branches/SAMBA_4_0/source/libcli/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/libcli/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -41,7 +41,6 @@ [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 Modified: branches/SAMBA_4_0/source/ntvfs/config.mk =================================================================== --- branches/SAMBA_4_0/source/ntvfs/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/ntvfs/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -25,7 +25,6 @@ OBJ_FILES = \ simple/vfs_simple.o \ simple/svfs_util.o -PUBLIC_DEPENDENCIES = LIBREPLACE # End MODULE ntvfs_simple ################################################ @@ -39,7 +38,6 @@ 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 @@ INIT_FUNCTION = ntvfs_nbench_init OBJ_FILES = \ nbench/vfs_nbench.o -PUBLIC_DEPENDENCIES = LIBREPLACE # End MODULE ntvfs_nbench ################################################ @@ -93,7 +90,6 @@ ntvfs_generic.o \ ntvfs_interface.o \ ntvfs_util.o -PUBLIC_DEPENDENCIES = LIBREPLACE # # End SUBSYSTEM NTVFS ################################################ Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -10,7 +10,6 @@ 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 @@ 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 @@ 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 Modified: branches/SAMBA_4_0/source/torture/config.mk =================================================================== --- branches/SAMBA_4_0/source/torture/config.mk 2006-09-07 09:59:39 UTC (rev 18212) +++ branches/SAMBA_4_0/source/torture/config.mk 2006-09-07 10:02:32 UTC (rev 18213) @@ -9,7 +9,7 @@ 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 @@ 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 @@ OBJ_FILES = \ nbench/nbio.o \ nbench/nbench.o -PUBLIC_DEPENDENCIES = LIBREPLACE # End MODULE TORTURE_NBENCH ################################# @@ -260,7 +258,7 @@ libnet/libnet_domain.o PUBLIC_DEPENDENCIES = \ LIBSAMBA-NET \ - POPT_CREDENTIALS LIBREPLACE + POPT_CREDENTIALS # End SUBSYSTEM TORTURE_NET #################################
