summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-07 10:02:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:50 -0500
commita46e12d0e07e1630f8ef15aff0f97cb2f1f4c273 (patch)
tree8b8dec47de3b082143435246201a75a04d0fb1dd /source4/lib
parentaf7886614a2b9e36b9e6a31f48a775b900d9183c (diff)
downloadsamba-a46e12d0e07e1630f8ef15aff0f97cb2f1f4c273.tar.gz
samba-a46e12d0e07e1630f8ef15aff0f97cb2f1f4c273.tar.bz2
samba-a46e12d0e07e1630f8ef15aff0f97cb2f1f4c273.zip
r18213: don't list LIBREPLACE depdendecies explicit and
always at it as first private dependencies metze (This used to be commit 135d096776b53ae09ffc2b4f767dfbd18139570f)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/charset/config.mk2
-rw-r--r--source4/lib/ldb/config.mk2
-rw-r--r--source4/lib/registry/config.mk3
-rw-r--r--source4/lib/samba3/config.mk1
-rw-r--r--source4/lib/smbreadline/readline.m44
-rw-r--r--source4/lib/socket/config.mk6
-rw-r--r--source4/lib/socket_wrapper/config.mk2
-rw-r--r--source4/lib/talloc/config.mk1
-rw-r--r--source4/lib/tdb/config.mk2
-rw-r--r--source4/lib/util/config.mk6
10 files changed, 11 insertions, 18 deletions
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index b4ed37f705..67703fbc37 100644
--- 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 709d818e47..6a23005b8f 100644
--- 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 599fade97f..89a77c231e 100644
--- 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 a90dc75492..5ec76c1339 100644
--- 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 29f7ac6e1a..ab85bba438 100644
--- 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 5799eb86f8..a823efb23e 100644
--- 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 9d38e75341..9e194230dc 100644
--- 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 dc523d4ede..3a8a22aa57 100644
--- 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 1dbe26428b..c5d1a33990 100644
--- 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 9694e8cf6c..401b4df005 100644
--- 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
################################################