Fix ITS#2047 - link ldbm.lo directly when building back-ldbm as a module

diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index cf7924a60984da50b9c3b369194793591f360d26..9a078dec789add007ee0b2e9a6f3eb0299a6532d 100644 (file)
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -11,7 +11,7 @@ OBJS = idl.lo add.lo search.lo cache.lo dbcache.lo dn2id.lo entry.lo \
                compare.lo group.lo modify.lo modrdn.lo delete.lo init.lo \
                config.lo bind.lo attr.lo filterindex.lo close.lo \
                alias.lo tools.lo key.lo extended.lo passwd.lo sasl.lo \
-               referral.lo attribute.lo operational.lo
+               referral.lo attribute.lo operational.lo $(@BUILD_LDBM@_OBJS)
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
@@ -20,20 +20,28 @@ BUILD_OPT = "--enable-ldbm"
 BUILD_MOD = @BUILD_LDBM@
 BUILD_MOD_DYNAMIC = @BUILD_LDBM_DYNAMIC@
 
+mod_SRCS = ldbm.c
+mod_OBJS = ldbm.lo
+
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_LDBM@_DEFS)
 
 shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
-NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
-UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(LDBM_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(LDBM_LIBS)
 
 LIBBASE = back_ldbm
 
 XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
+XXSRCS = $(@BUILD_LDBM@_SRCS)
 
 all-local-lib: ../.backend
 
 ../.backend: lib$(LIBBASE).a
        @touch $@
 
+ldbm.c : $(srcdir)/../../../libraries/libldbm/ldbm.c
+       $(RM) $@; $(LN_S) $(srcdir)/../../../libraries/libldbm/ldbm.c $@
+
+depend-common: $(XXSRCS)