Add missing mkdirs in make install rules

diff --git a/clients/fax500/Make-template b/clients/fax500/Make-template
index e3b224d77260d447008d1afbcd9138468b9d007f..f80e4a392047fb37ed2c08747b10bc6f36ca7dab 100644 (file)
--- a/clients/fax500/Make-template
+++ b/clients/fax500/Make-template
@@ -53,12 +53,12 @@ fax5version.c:      main.o faxtotpc.o $(LDIR)/libldap.a
        < Version.c > $@ )
 
 install:       rp500 xrpcomp fax500 FORCE
-               -$(MKDIR) -p $(ETCDIR) $(BINDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(ETCDIR)
-               $(SED) -e 's%ETCDIR%$(ETCDIR)%' xrpcomp > /tmp/xrpcomp.tmp
-               $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp
+               -$(MKDIR) -p $(LDAP_ETCDIR) $(LDAP_BINDIR) $(LDAP_LIBEXECDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(LDAP_LIBEXECDIR)
+               $(SED) -e 's%ETCDIR%$(LDAP_LIBEXECDIR)%' xrpcomp > /tmp/xrpcomp.tmp
+               $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(LDAP_BINDIR)/xrpcomp
                $(RM) /tmp/xrpcomp.tmp
-               $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(ETCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(LDAP_LIBEXECDIR)
 
 lint:  FORCE
        $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)
@@ -75,13 +75,3 @@ depend:      FORCE
 links:
        @$(LN) .src/README .src/xrpcomp .src/*.[ch] .
 
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-rp500.o: rp500.c ../../include/ldapconfig.h ../../include/lber.h
-rp500.o: ../../include/ldap.h
-main.o: main.c ../../include/ldapconfig.h ../../include/portable.h
-main.o: ../../include/lber.h ../../include/ldap.h
-faxtotpc.o: faxtotpc.c
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index d3a5f49884f4d0ce453b89642c22a9faf83c4a2d..68758fda5ffb3aa78d6e850b4e4ca31930a8743a 100644 (file)
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -21,14 +21,14 @@ SRCS        = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                attr.c entry.c config.c backend.c result.c operation.c \
                dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
                value.c ava.c bind.c unbind.c abandon.c filterentry.c \
-               phonetic.c regex.c acl.c str2filter.c aclparse.c init.c \
+               phonetic.c acl.c str2filter.c aclparse.c init.c \
                detach.c strdup.c tempnam.c repl.c lock.c \
                schema.c schemaparse.c monitor.c configinfo.c
 OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                attr.o entry.o config.o backend.o result.o operation.o \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
                value.o ava.o bind.o unbind.o abandon.o filterentry.o \
-               phonetic.o regex.o acl.o str2filter.o aclparse.o init.o \
+               phonetic.o acl.o str2filter.o aclparse.o init.o \
                detach.o strdup.o tempnam.o repl.o lock.o \
                schema.o schemaparse.o monitor.o configinfo.o
 
@@ -36,8 +36,9 @@ INCLUDES= -I. -I$(HDIR) $(KRBINCLUDEFLAG)
 DEFINES = $(DEFS) $(SERVERDEFS)
 CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) $(THREADS)
 LDFLAGS        = -L$(LDIR) $(KRBLIBFLAG)
-LIBS   = $(KRBLIBS) -llber -lldbm -lavl -llthread -lldif $(THREADSLIB) \
-               $(LDBMLIB) $(ALIBS)
+LIBS   = $(KRBLIBS) -llber -lldbm -lavl -llthread -lldif \
+               $(REGEXLIB) $(THREADSLIB) \
+               $(LDBMLIB) $(LDAP_CRYPT_LIB) $(LDAP_TCP_WRAPPERS_LIB) $(ALIBS)
 
 all: FORCE
        @if [ -z "$(MAKESLAPD)" ]; then \
@@ -100,26 +101,34 @@ version.c: libbackends.a $(OBJS) $(LDIR)/liblber/liblber.a \
        -e "s|%VERSION%|$${v}|" \
        < Version.c > $@)
 
-install: all $(ETCDIR) $(ETCDIR)/slapd $(ETCDIR)/slapd.conf \
-               $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.oc.conf \
+install: all $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slapd \
+               $(LDAP_ETCDIR) $(LDAP_ETCDIR)/slapd.conf \
+               $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.oc.conf \
                install-tools
 
-$(ETCDIR)/slapd:       slapd
-       $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(ETCDIR)
+$(LDAP_LIBEXECDIR): FORCE
+       @-$(MKDIR) $(LDAP_LIBEXECDIR)
 
-$(ETCDIR)/slapd.conf:  slapd.conf
-       $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' slapd.conf > /tmp/slapd.$$
-       -$(MV) $(ETCDIR)/slapd.conf $(ETCDIR)/slapd.conf-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(ETCDIR)/slapd.conf
+$(LDAP_ETCDIR): FORCE
+       @-$(MKDIR) $(LDAP_ETCDIR)
+
+$(LDAP_LIBEXECDIR)/slapd:      slapd
+       $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LDAP_LIBEXECDIR)
+
+$(LDAP_ETCDIR)/slapd.conf:     slapd.conf
+       $(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' slapd.conf > /tmp/slapd.$$
+       -$(MV) $(LDAP_ETCDIR)/slapd.conf $(LDAP_ETCDIR)/slapd.conf-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(LDAP_ETCDIR)/slapd.conf
        $(RM) -f /tmp/slapd.$$
 
-$(ETCDIR)/slapd.at.conf:       slapd.at.conf
-       -$(MV) $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.at.conf-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(ETCDIR)
+$(LDAP_ETCDIR)/slapd.at.conf:  slapd.at.conf
+       -$(MV) $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.at.conf-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(LDAP_ETCDIR)
 
-$(ETCDIR)/slapd.oc.conf:       slapd.oc.conf
-       -$(MV) $(ETCDIR)/slapd.oc.conf $(ETCDIR)/slapd.oc.conf-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(ETCDIR)
+$(LDAP_ETCDIR)/slapd.oc.conf:  slapd.oc.conf
+       @$(MKDIR) $(LDAP_ETCDIR)
+       -$(MV) $(LDAP_ETCDIR)/slapd.oc.conf $(LDAP_ETCDIR)/slapd.oc.conf-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(LDAP_ETCDIR)
 
 install-tools: FORCE
        (cd tools; $(MAKE) $(MFLAGS) install)
@@ -164,103 +173,3 @@ links:
            fi; \
        done; 
 
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-main.o: main.c ../../include/portable.h slap.h ../../include/avl.h
-main.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-main.o: ../../include/ldif.h ../../include/ldapconfig.h
-daemon.o: daemon.c slap.h ../../include/avl.h ../../include/lber.h
-daemon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-daemon.o: ../../include/portable.h ../../include/ldapconfig.h
-connection.o: connection.c ../../include/portable.h slap.h ../../include/avl.h
-connection.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-connection.o: ../../include/ldif.h
-search.o: search.c slap.h ../../include/avl.h ../../include/lber.h
-search.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-search.o: ../../include/ldapconfig.h
-filter.o: filter.c slap.h ../../include/avl.h ../../include/lber.h
-filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-add.o: add.c slap.h ../../include/avl.h ../../include/lber.h
-add.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-charray.o: charray.c slap.h ../../include/avl.h ../../include/lber.h
-charray.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-attr.o: attr.c ../../include/portable.h slap.h ../../include/avl.h
-attr.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-attr.o: ../../include/ldif.h
-entry.o: entry.c slap.h ../../include/avl.h ../../include/lber.h
-entry.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: config.c slap.h ../../include/avl.h ../../include/lber.h
-config.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: ../../include/ldapconfig.h
-backend.o: backend.c slap.h ../../include/avl.h ../../include/lber.h
-backend.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-result.o: result.c ../../include/portable.h slap.h ../../include/avl.h
-result.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-result.o: ../../include/ldif.h
-operation.o: operation.c slap.h ../../include/avl.h ../../include/lber.h
-operation.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-dn.o: dn.c ../../include/portable.h slap.h ../../include/avl.h
-dn.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-dn.o: ../../include/ldif.h
-compare.o: compare.c slap.h ../../include/avl.h ../../include/lber.h
-compare.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modify.o: modify.c slap.h ../../include/avl.h ../../include/lber.h
-modify.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-delete.o: delete.c slap.h ../../include/avl.h ../../include/lber.h
-delete.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modrdn.o: modrdn.c slap.h ../../include/avl.h ../../include/lber.h
-modrdn.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-ch_malloc.o: ch_malloc.c slap.h ../../include/avl.h ../../include/lber.h
-ch_malloc.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-value.o: value.c ../../include/portable.h slap.h ../../include/avl.h
-value.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-value.o: ../../include/ldif.h
-ava.o: ava.c slap.h ../../include/avl.h ../../include/lber.h
-ava.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-bind.o: bind.c slap.h ../../include/avl.h ../../include/lber.h
-bind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-unbind.o: unbind.c slap.h ../../include/avl.h ../../include/lber.h
-unbind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-abandon.o: abandon.c slap.h ../../include/avl.h ../../include/lber.h
-abandon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-filterentry.o: filterentry.c ../../include/regex.h slap.h ../../include/avl.h
-filterentry.o: ../../include/lber.h ../../include/ldap.h
-filterentry.o: ../../include/lthread.h ../../include/ldif.h
-phonetic.o: phonetic.c ../../include/portable.h slap.h ../../include/avl.h
-phonetic.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-phonetic.o: ../../include/ldif.h
-regex.o: regex.c ../../include/portable.h
-acl.o: acl.c ../../include/regex.h slap.h ../../include/avl.h
-acl.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-acl.o: ../../include/ldif.h
-str2filter.o: str2filter.c slap.h ../../include/avl.h ../../include/lber.h
-str2filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-aclparse.o: aclparse.c ../../include/regex.h slap.h ../../include/avl.h
-aclparse.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-aclparse.o: ../../include/ldif.h ../../include/portable.h
-init.o: init.c ../../include/portable.h slap.h ../../include/avl.h
-init.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-init.o: ../../include/ldif.h
-detach.o: detach.c ../../include/portable.h
-strdup.o: strdup.c
-tempnam.o: tempnam.c
-repl.o: repl.c slap.h ../../include/avl.h ../../include/lber.h
-repl.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-lock.o: lock.c ../../include/portable.h slap.h ../../include/avl.h
-lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-lock.o: ../../include/ldif.h
-schema.o: schema.c slap.h ../../include/avl.h ../../include/lber.h
-schema.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-schemaparse.o: schemaparse.c slap.h ../../include/avl.h ../../include/lber.h
-schemaparse.o: ../../include/ldap.h ../../include/lthread.h
-schemaparse.o: ../../include/ldif.h
-monitor.o: monitor.c slap.h ../../include/avl.h ../../include/lber.h
-monitor.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-monitor.o: ../../include/ldapconfig.h
-configinfo.o: configinfo.c slap.h ../../include/avl.h ../../include/lber.h
-configinfo.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-configinfo.o: ../../include/ldapconfig.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 112c4abbd81bb1c4a8e151e1223c8c07f383f3a3..a853719a69ede2137290da86646e8ed20c6ad1ff 100644 (file)
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -24,15 +24,15 @@ OBJS2       = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
                ../aclparse.o ../schema.o ../result.o ../filterentry.o \
                ../acl.o ../phonetic.o ../attr.o ../value.o ../entry.o \
                ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
-               ../schemaparse.o ../regex.o ../strdup.o
+               ../schemaparse.o ../strdup.o
 
 INCLUDES= -I. -I$(HDIR) $(EXINCLUDES)
-DEFINES = $(DEFS) $(SERVERDEFS) $(THREADS)
+DEFINES = $(DEFS) $(LDAP_CRYPT) $(SERVERDEFS) $(THREADS)
 CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS)
 LDFLAGS        = -L$(LDIR) $(EXLDFLAGS)
 LIBS   = -lldif -lldap -llber -lldbm -lavl $(LDBMLIB) $(EXLIBS) $(ALIBS)
 LIBS2  = -lldif -lldbm -lavl $(LDBMLIB) -llber $(KRBLIBFLAG) $(KRBLIBS) \
-               -llthread $(THREADSLIB) $(ALIBS)
+               -llthread $(THREADSLIB) $(ALIBS) $(LDAP_CRYPT_LIB)
 
 all:   build-edb2ldif ldif2index ldif2ldbm ldbmcat ldif2id2entry \
                ldif2id2children centipede ldbmtest ldif
@@ -73,13 +73,10 @@ ldif2index: ldif2index.o ../libbackends.a $(OBJS2)
        $(CC) $(ALDFLAGS) -o $@ ldif2index.o $(OBJS2) \
                ../libbackends.a $(LDFLAGS) $(LIBS2)
 
-ldif2ldbm:     ldif2ldbm.sed.o ../libbackends.a $(OBJS2)
-       $(CC) $(ALDFLAGS) -o $@ ldif2ldbm.sed.o $(OBJS2) \
+ldif2ldbm:     ldif2ldbm.o ../libbackends.a $(OBJS2)
+       $(CC) $(ALDFLAGS) -o $@ ldif2ldbm.o $(OBJS2) \
                ../libbackends.a $(LDFLAGS) $(LIBS2)
 
-ldif2ldbm.sed.c: ldif2ldbm.c
-       $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' ldif2ldbm.c > ldif2ldbm.sed.c
-
 ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2)
        $(CC) $(ALDFLAGS) -o $@ ldif2id2entry.o $(OBJS2) \
                ../libbackends.a $(LDFLAGS) $(LIBS2)
@@ -106,49 +103,52 @@ ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2)
        $(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \
                ../libbackends.a $(LDFLAGS) $(LIBS2)
 
-install: $(ETCDIR) $(ETCDIR)/edb2ldif $(ETCDIR)/ldif2ldbm \
-       $(ETCDIR)/ldif2index $(ETCDIR)/ldif2id2entry \
-       $(ETCDIR)/ldif2id2children $(ETCDIR)/ldbmcat \
-       $(ETCDIR)/centipede $(ETCDIR)/ldbmtest \
-       $(ETCDIR)/ldif
+install: $(LDAP_SBINDIR) $(LDAP_SBINDIR)/edb2ldif $(LDAP_SBINDIR)/ldif2ldbm \
+       $(LDAP_SBINDIR)/ldif2index $(LDAP_SBINDIR)/ldif2id2entry \
+       $(LDAP_SBINDIR)/ldif2id2children $(LDAP_SBINDIR)/ldbmcat \
+       $(LDAP_SBINDIR)/centipede $(LDAP_SBINDIR)/ldbmtest \
+       $(LDAP_SBINDIR)/ldif
+
+$(LDAP_SBINDIR): FORCE
+       @-$(MKDIR) $(LDAP_SBINDIR)
 
-$(ETCDIR)/edb2ldif:    build-edb2ldif
+$(LDAP_SBINDIR)/edb2ldif:      build-edb2ldif
        @if [ "$(HAVEISODE)" = "yes" ]; then \
-               $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(ETCDIR); \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(LDAP_SBINDIR); \
        else \
                exit 0; \
        fi
 
-$(ETCDIR)/chlog2replog:        build-chlog2replog
+$(LDAP_SBINDIR)/chlog2replog:  build-chlog2replog
        @if [ "$(HAVEISODE)" = "yes" ]; then \
-               $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(ETCDIR); \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(LDAP_SBINDIR); \
        else \
                exit 0; \
        fi
 
-$(ETCDIR)/ldif2ldbm:   ldif2ldbm
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(ETCDIR)
+$(LDAP_SBINDIR)/ldif2ldbm:     ldif2ldbm
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldif2index:  ldif2index
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(ETCDIR)
+$(LDAP_SBINDIR)/ldif2index:    ldif2index
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldif2id2entry:       ldif2id2entry
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(ETCDIR)
+$(LDAP_SBINDIR)/ldif2id2entry: ldif2id2entry
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldif2id2children:    ldif2id2children
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(ETCDIR)
+$(LDAP_SBINDIR)/ldif2id2children:      ldif2id2children
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldbmcat:     ldbmcat
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(ETCDIR)
+$(LDAP_SBINDIR)/ldbmcat:       ldbmcat
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldif:        ldif
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(ETCDIR)
+$(LDAP_SBINDIR)/ldif:  ldif
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(LDAP_SBINDIR)
 
-$(ETCDIR)/centipede:   centipede
-       $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(ETCDIR)
+$(LDAP_SBINDIR)/centipede:     centipede
+       $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(LDAP_SBINDIR)
 
-$(ETCDIR)/ldbmtest:    ldbmtest
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(ETCDIR)
+$(LDAP_SBINDIR)/ldbmtest:      ldbmtest
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(LDAP_SBINDIR)
 
 lint:  FORCE
        $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)
@@ -160,60 +160,17 @@ clean:    FORCE
        @echo "making clean in `$(PWD)`"
        $(RM) edb2ldif ldif2index *.o core a.out edb2-vers.c \
                ldif2ldbm ldif2id2entry ldif2id2children ldbmcat ldif \
-               centipede chlog2replog sizecount ldif2ldbm.sed.c ldbmtest
+               centipede chlog2replog sizecount ldbmtest
 
-depend:        ldif2ldbm.sed.c FORCE
+depend:        FORCE
        @if [ ! -z "$(HAVEISODE)" ]; then \
            DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
        fi; \
        $(MKDEP) $(INCLUDES) $(DEFINES) $$DEPENDEXTRAS ldif2index.c \
            ldif2ldbm.c ldif2id2entry.c ldif2id2children.c ldbmcat.c \
-           centipede.c sizecount.c ldif2ldbm.sed.c ldbmtest.c ldif.c
+           centipede.c sizecount.c ldbmtest.c ldif.c
 
 links:
        @echo "making links in `$(PWD)`"
        @$(LN) .src/*.[ch] .
 
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-chlog2replog.o: chlog2replog.c ../../../include/ldif.h
-edb2ldif.o: edb2ldif.c
-ldapsyntax.o: ldapsyntax.c ../../../include/lber.h ../../../include/ldap.h
-ldapsyntax.o: ../../../include/ldif.h ldapsyntax.h
-ldif2index.o: ldif2index.c ../slap.h ../../../include/avl.h
-ldif2index.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2index.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ldif2ldbm.c ../slap.h ../../../include/avl.h
-ldif2ldbm.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2entry.o: ldif2id2entry.c ../slap.h ../../../include/avl.h
-ldif2id2entry.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2entry.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2entry.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2children.o: ldif2id2children.c ../slap.h ../../../include/avl.h
-ldif2id2children.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2children.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2children.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmcat.o: ldbmcat.c ../../../include/ldbm.h ../slap.h ../../../include/avl.h
-ldbmcat.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmcat.o: ../../../include/lthread.h ../../../include/ldif.h
-centipede.o: centipede.c ../../../include/lber.h ../../../include/ldap.h
-centipede.o: ../../../include/ldapconfig.h ../../../include/ldbm.h
-sizecount.o: sizecount.c ../../../include/ldbm.h ../../../include/lber.h
-sizecount.o: ../../../include/ldap.h ../../../include/portable.h
-ldif2ldbm.sed.o: ldif2ldbm.sed.c ../slap.h ../../../include/avl.h
-ldif2ldbm.sed.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.sed.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.sed.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmtest.o: ldbmtest.c ../../../include/portable.h
-ldbmtest.o: ../../../include/ldapconfig.h ../slap.h ../../../include/avl.h
-ldbmtest.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmtest.o: ../../../include/lthread.h ../../../include/ldif.h
-ldbmtest.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif.o: ldif.c ../../../include/lber.h ../../../include/ldap.h
-ldif.o: ../../../include/ldif.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY