From 85421b283969d529ada754ba3a43b87c20a2498e Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 3 Feb 1999 17:48:31 +0000
Subject: [PATCH] Import slapd library depends from devel.
---
CHANGES | 1 +
build/top.mk | 4 ++++
servers/slapd/Makefile.in | 7 +------
servers/slapd/tools/Makefile.in | 21 +++++++++++----------
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/CHANGES b/CHANGES
index c66645f4b6..65570aa837 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Changes included in OpenLDAP 1.2
Build environment
Fixed --without-threads building
Fixed mkdep to handle multiple dependent files on one line
+ Fixed slapd library dependencies
Fixed openldap.m4 to "protect" shell variable
Fixed HAVE_PHREAD_FINAL typo
Fixed pthread detection on Digital UNIX
diff --git a/build/top.mk b/build/top.mk
index 6a5843e86b..28470d53d0 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -93,11 +93,15 @@ LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la
LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la
LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a
LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a
+
+LDAP_LIBAVL_DEPEND = $(LDAP_LIBDIR)/libavl/libavl.a
LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a
LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/liblthread/liblthread.a
LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \
$(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND)
+SLAPD_LIBDEPEND = $(LDAP_LIBDEPEND) $(LDAP_LIBAVL_DEPEND) \
+ $(LDAP_LIBLDBM_DEPEND) $(LDAP_LIBLTHREAD_DEPEND)
# AutoConfig generated
AC_CC = @CC@
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 815a523030..c2fadfa82a 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -75,12 +75,7 @@ libbackends.a: .backend
fi
@ls -l libbackends.a
-version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
- $(LDAP_LIBDIR)/libldbm.a \
- $(LDAP_LIBDIR)/libavl.a \
- $(LDAP_LIBDIR)/libldif.a \
- $(LDAP_LIBDIR)/liblutil.a \
- $(LDAP_LIBDIR)/liblthread.a
+version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND)
$(RM) $@
(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index b9fd8e41ce..69451d921b 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -76,34 +76,35 @@ build-chlog2replog: FORCE
echo "run configure with --with-isode to build chlog2replog"; \
fi
-chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o
+chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o $(LIBS)
-ldif2index: ldif2index.o ../libbackends.a $(OBJS2)
+ldif2index: ldif2index.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldif2index.o $(OBJS2) ../libbackends.a $(LIBS)
-ldif2ldbm: ldif2ldbm.o ../libbackends.a $(OBJS2)
+ldif2ldbm: ldif2ldbm.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldif2ldbm.o $(OBJS2) ../libbackends.a $(LIBS)
-ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2)
+ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldif2id2entry.o $(OBJS2) ../libbackends.a $(LIBS)
-ldif2id2children: ldif2id2children.o ../libbackends.a $(OBJS2)
+ldif2id2children: ldif2id2children.o ../libbackends.a \
+ $(OBJS2) $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldif2id2children.o $(OBJS2) ../libbackends.a $(LIBS)
-ldbmcat: ldbmcat.o
+ldbmcat: ldbmcat.o $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldbmcat.o $(LIBS)
-ldif: ldif.o
+ldif: ldif.o $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ ldif.o $(LIBS)
-centipede: centipede.o
+centipede: centipede.o $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ centipede.o $(LIBS)
-sizecount: sizecount.o ../phonetic.o ../ch_malloc.o
+sizecount: sizecount.o ../phonetic.o ../ch_malloc.o $(SLAPD_LIBDEPEND)
$(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o $(LIBS)
-ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2)
+ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND)
$(LTLINK) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)
clean-local: FORCE
--
GitLab