mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-09 02:52:04 +08:00
Fix slapd/tool dependencies on libraries.
This commit is contained in:
parent
368a507c9a
commit
a3cf741ab7
@ -96,11 +96,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)/libldbm/libavl.a
|
||||
LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a
|
||||
LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/liblthread/libldap_r.la
|
||||
LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
|
||||
|
||||
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@
|
||||
|
@ -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}|" \
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user