Updated some items

[openldap] / servers / slapd / tools / Makefile.in

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index f4725a0dfb5133b6efe37fb51ed633fdd89cc5f1..f53ed416295b7e3dbf7d764f959b509c99e123c6 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -14,19 +14,28 @@
 #-----------------------------------------------------------------------------
 HAVE_ISODE = @HAVE_ISODE@
 BUILD_LDBM = @BUILD_LDBM@
+BUILD_BDB2 = @BUILD_BDB2@
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
 
-XLIBS = $(LDAP_LIBS) $(SLAPD_LIBS) -lavl $(LDAP_LIBLDBM)
-XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD)
+XLIBS = -lavl -lldif -lldbm -lldap_r -llber -llutil
+XXLIBS = $(LDAPD_LIBS) $(SLAPD_LIBS) \
+       $(PERL_LDFLAGS) $(LDBM_LIBS) $(KRB_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
 
-PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \
-       ldif2id2children centipede ldbmtest ldif
+PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry ldif2id2children \
+       centipede ldbmtest ldif
+
+PROGRAMS2=ldif2index-bdb2 ldif2ldbm-bdb2 \
+       ldif2id2entry-bdb2 ldif2id2children-bdb2
 
 SRCS = centipede.c ldbmcat.c ldbmtest.c sizecount.c \
        ldif.c ldif2id2children.c ldif2id2entry.c ldif2index.c ldif2ldbm.c
 
+SRCS2 = ldif2id2children-bdb2.c ldif2id2entry-bdb2.c \
+       ldif2index-bdb2.c ldif2ldbm-bdb2.c
+
 XSRCS = edb2-vers.c
 
 EDB2LDIFSRCS   = edb2ldif.c ldapsyntax.c
@@ -38,7 +47,7 @@ OBJS2 = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
                ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
                ../schemaparse.o
 
-all-local: build-ldbm build-edb2ldif build-chlog2replog
+all-local: build-ldbm build-bdb2 build-edb2ldif build-chlog2replog
 
 build-ldbm: FORCE
        @if [ "$(BUILD_LDBM)" = "yes" ]; then \
@@ -47,8 +56,17 @@ build-ldbm: FORCE
                echo "run configure with --with-ldbm to build LDBM tools"; \
     fi
 
+build-bdb2: FORCE
+       @if [ "$(BUILD_BDB2)" = "yes" ]; then \
+               $(MAKE) $(MFLAGS) bdb2-tools; \
+    else \
+               echo "run configure with --enable-bdb2 to build BDB2 tools"; \
+    fi
+
 ldbm-tools: $(PROGRAMS)
 
+bdb2-tools: $(PROGRAMS2)
+
 build-edb2ldif:        FORCE
        @if [ "$(HAVE_ISODE)" = "yes" ]; then \
                $(MAKE) $(MFLAGS) edb2ldif; \
@@ -74,57 +92,78 @@ 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)
+ldif2index-bdb2:       ldif2index-bdb2.o ../libbackends.a \
+               $(OBJS2) $(SLAPD_LIBDEPEND) 
+       $(LTLINK) -o $@ ldif2index-bdb2.o $(OBJS2) ../libbackends.a $(LIBS)
+
+ldif2ldbm:     ldif2ldbm.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND) 
        $(LTLINK) -o $@ ldif2ldbm.o $(OBJS2) ../libbackends.a $(LIBS)
 
-ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2)
+ldif2ldbm-bdb2:        ldif2ldbm-bdb2.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND) 
+       $(LTLINK) -o $@ ldif2ldbm-bdb2.o $(OBJS2) ../libbackends.a $(LIBS)
+
+ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2) $(SLAPD_LIBDEPEND) 
        $(LTLINK) -o $@ ldif2id2entry.o $(OBJS2) ../libbackends.a $(LIBS)
 
-ldif2id2children:      ldif2id2children.o ../libbackends.a $(OBJS2)
+ldif2id2entry-bdb2:    ldif2id2entry-bdb2.o ../libbackends.a \
+               $(OBJS2) $(SLAPD_LIBDEPEND) 
+       $(LTLINK) -o $@ ldif2id2entry-bdb2.o $(OBJS2) ../libbackends.a $(LIBS)
+
+ldif2id2children:      ldif2id2children.o ../libbackends.a \
+               $(OBJS2) $(SLAPD_LIBDEPEND) 
        $(LTLINK) -o $@ ldif2id2children.o $(OBJS2) ../libbackends.a $(LIBS)
 
-ldbmcat:       ldbmcat.o
+ldif2id2children-bdb2: ldif2id2children-bdb2.o ../libbackends.a \
+               $(OBJS2) $(SLAPD_LIBDEPEND) 
+       $(LTLINK) -o $@ ldif2id2children-bdb2.o $(OBJS2) ../libbackends.a $(LIBS)
+
+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
-       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c \
+       $(RM) $(PROGRAMS) $(PROGRAMS2) $(XPROGRAMS) $(XSRCS) edb2-vers.c \
                *.o core .libs/*
 
 depend-local: FORCE
-       @DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ; \
+       @DEPEND=no ; DEPEND_LDBM= ; DEPEND_BDB2= ; DEPEND_ISODE= ; \
        if [ "$(BUILD_LDBM)" = "yes" ]; then \
         DEPEND_LDBM="$(SRCS)"; \
                DEPEND=yes ; \
+    fi; \
+       if [ "$(BUILD_BDB2)" = "yes" ]; then \
+        DEPEND_BDB2="$(SRCS2)"; \
+               DEPEND=yes ; \
     fi; \
        if [ "$(HAVE_ISODE)" = "yes" ]; then \
         DEPEND_ISODE="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
                DEPEND=yes ; \
     fi; \
        if [ "$$DEPEND" = "yes" ]; then \
-       $(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE $$DEPEND_LDBM; \
+       $(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE \
+                       $$DEPEND_LDBM $$DEPEND_BDB2; \
        else \
                echo "slapd-tools: no dependencies to make"; \
        fi
 
-install-local: install-ldbm install-isode FORCE
+install-local: install-ldbm install-bdb2 install-isode FORCE
 
 install-ldbm: FORCE
        @-$(MKDIR) $(sbindir) 
@@ -141,6 +180,17 @@ install-ldbm: FORCE
                exit 0 ; \
        fi
 
+install-bdb2: FORCE
+       @-$(MKDIR) $(sbindir) 
+       @if [ "$(BUILD_BDB2)" = "yes" ]; then \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm-bdb2 $(sbindir)   ; \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2index-bdb2 $(sbindir)  ; \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry-bdb2 $(sbindir)       ; \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children-bdb2 $(sbindir) ; \
+       else \
+               exit 0 ; \
+       fi
+
 install-isode: FORCE
        @-$(MKDIR) $(sbindir)
        @if [ "$(HAVE_ISODE)" = "yes" ]; then \