"make veryclean" now lives up to its name.

diff --git a/Makefile.in b/Makefile.in
index e4fbe950e6206c8cb51e2333e19ca05552ffe5f0..91866269b1d71a31e3f28f9983efe7440bef7f08 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 
 SUBDIRS= include libraries clients servers # contrib
-CLEANDIRS= tests
+CLEANDIRS= tests doc
 INSTALLDIRS= doc
 
 makefiles:     FORCE

diff --git a/build/lib.mk b/build/lib.mk
index ddb8110ac4160a4b9c99c0306671e40d369d098f..a56086fb5275fd86c1ba8b2189c563b0d8b03ccf 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -23,7 +23,7 @@ lint5: lint5-local FORCE
 
 clean-common:  FORCE
        $(RM) $(LIBRARY) ../$(LIBRARY) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-               *.o a.out core version.c *.lo .libs/*
+               *.o *.lo a.out core version.c .libs/*
 
 depend-common: FORCE
        $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)

diff --git a/build/srv.mk b/build/srv.mk
index 872d04c1e43a6d4b4659ac20bf07c22035dd8cf7..6f1ad9637b870247dae840c9b04b3cc705dc5598 100644 (file)
--- a/build/srv.mk
+++ b/build/srv.mk
@@ -10,19 +10,8 @@ all-common: FORCE
                echo "run configure with $(BUILD_OPT) to build $(PROGRAMS)"; \
        fi
 
-clean-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
-               $(MAKE) $(MFLAGS) clean-srv; \
-       else \
-               echo "run configure with $(BUILD_OPT) to clean $(PROGRAMS)"; \
-       fi
-
-veryclean-common: FORCE
-       @if [ "$(BUILD_SRV)" = "yes" ]; then \
-               $(MAKE) $(MFLAGS) veryclean-srv; \
-       else \
-               echo "run configure with $(BUILD_OPT) to very clean $(PROGRAMS)"; \
-       fi
+clean-common: clean-srv FORCE
+veryclean-common: veryclean-srv FORCE
 
 lint-common: FORCE
        @if [ "$(BUILD_SRV)" = "yes" ]; then \

diff --git a/build/top.mk b/build/top.mk
index 0fdbf962dc8e5a46278dacdee0805c6ae7d53d11..8d9f78549964b5fb69e5000a06e24810effbafb4 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -133,6 +133,7 @@ lint5-local:
 
 veryclean: FORCE
        $(RM) Makefile
+       $(RM) -r .libs
 
 Makefile: Makefile.in $(top_srcdir)/build/top.mk
 

diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in
index 82ba34b1306932171c4a2e90b1bce7031f8834b5..893c3a416efae36a1ba9bac3ad8216e99620e9bc 100644 (file)
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@@ -4,7 +4,7 @@
 PROGRAMS= go500gw go500
 
 SRCS=  go500.c go500gw.c 
-XSRCS= gwversion.o goversion.o
+XSRCS= gwversion.c goversion.c
 GOOBJS =  go500.o
 GWOBJS =  go500gw.o
 

diff --git a/configure.in b/configure.in
index ce7cea7133e12930ed47b02729dd4f2d2afe5a7c..048bf035ae40120d1c79bb117d401de6f0abd1e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -809,13 +809,13 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
        OL_NDBM
 
        if test $ol_cv_ndbm = yes ; then
-               ol_link_ldbm=ndbm
-               ol_with_ldbm_api=ndbm
-
-               if test $ol_with_ldbm_api = ndbm ; then
+               if test $ol_with_ldbm_api = auto ; then
                        AC_MSG_WARN([Attempting to use NDBM.  Functionality will be limited.])
                fi
 
+               ol_link_ldbm=ndbm
+               ol_with_ldbm_api=ndbm
+
                if test $ol_cv_lib_ndbm != yes ; then
                        LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
                fi

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index ec2e71f362b378d863ad4a6712cfdf9557a42596..b47fc6885f0878a557892ce681842204d41959b2 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -3,6 +3,7 @@
 ##
 PROGRAMS=slapd
 XPROGRAMS=sslapd libbackends.a .backend
+XSRCS=version.c
 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 \
@@ -84,14 +85,30 @@ version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
        -e "s|%VERSION%|$${v}|" \
        < $(srcdir)/Version.c > $@)
 
+depend-local: FORCE
+       @for i in back-* shell-backends tools; do \
+               if [ -d $$i ]; then \
+                       echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
+                       ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
+               fi; \
+       done
+
 clean-local: FORCE
-       @for i in back-* tools; do \
+       @for i in back-* shell-backends tools; do \
                if [ -d $$i ]; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
                fi; \
        done
 
+veryclean-local: FORCE
+       @for i in back-* shell-backends tools; do \
+               if [ -d $$i ]; then \
+                       echo; echo "  cd $$i; $(MAKE) $(MFLAGS) veryclean"; \
+                       ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
+               fi; \
+       done
+
 install-local: install-slapd install-conf install-tools
 
 install-slapd: FORCE

diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index 9ad580055fb88a69d5cc2d972c62edbb678eaa58..7e6d2f508ce03fe96cde54d9fde36f8b1843819e 100644 (file)
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -1,3 +1,4 @@
+XSRCS = version.c
 SRCS   = idl.c add.c search.c cache.c dbcache.c dn2id.c id2entry.c \
                index.c id2children.c nextid.c abandon.c compare.c group.c \
                modify.c modrdn.c delete.c init.c config.c bind.c attr.c \
@@ -33,4 +34,3 @@ version.c:    $(OBJS) $(LDAP_LIBDEPEND)
                -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
                -e "s|%VERSION%|$${v}|" \
                < $(srcdir)/Version.c > $@)
-

diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index 47b4a782fe6075f96affd70503dc40e63d6fca4b..339dc9ebf002d75a9e6569202dae18e1e4241f79 100644 (file)
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -1,3 +1,4 @@
+XSRCS  = version.c
 SRCS   = search.c config.c
 OBJS   = search.o config.o
 
@@ -26,3 +27,4 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND)
        -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
        -e "s|%VERSION%|$${v}|" \
        < $(srcdir)/Version.c > $@)
+

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index 0ae8b981808c1639cdf29bfad8aaa0a2e0bc67ed..58291f2aae71b74d7d0fc706e8ddc3907a63f4e8 100644 (file)
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -1,3 +1,4 @@
+XSRCS  = version.c
 SRCS   = init.c config.c fork.c search.c bind.c unbind.c add.c delete.c \
                modify.c modrdn.c compare.c abandon.c result.c
 OBJS   = init.o config.o fork.o search.o bind.o unbind.o add.o delete.o \
@@ -28,3 +29,4 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND)
        -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
        -e "s|%VERSION%|$${v}|" \
        < $(srcdir)/Version.c > $@)
+

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index fe5d8b07713cdfd24b3b564c5a0f4215087d0de9..511f3dcda010448231b4f62dcb07efd449f1dd77 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -24,6 +24,8 @@ PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \
 SRCS = centipede.c ldbmcat.c ldbmtest.c sizecount.c \
        ldif.c ldif2id2children.c ldif2id2entry.c ldif2index.c ldif2ldbm.c
 
+XSRCS = edb2-vers.c
+
 EDB2LDIFSRCS   = edb2ldif.c ldapsyntax.c
 EDB2LDIFOBJS   = edb2ldif.o ldapsyntax.o
 
@@ -103,8 +105,8 @@ ldbmtest:   ldbmtest.o ../libbackends.a $(OBJS2)
        $(LTLINK) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)
 
 clean-local: FORCE
-       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core \
-       .libs/*
+       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c \
+               *.o core .libs/*
 
 depend-local: FORCE
        @DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ; \

diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index 8226e7a31592aeae3c0507558d0c74513b79aa2c..4400c02699401cee6fc24e57e18d111c5339fb06 100644 (file)
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -5,6 +5,8 @@
 PROGRAMS = slurpd
 XPROGRAMS = sslurpd
 
+XSRCS  = version.c
+
 SRCS   =       admin.c args.c ch_malloc.c config.c \
                fm.c globals.c ldap_op.c lock.c main.c re.c \
                reject.c replica.c replog.c ri.c rq.c sanity.c st.c \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5965bd6d15504f438da655b954a4861a0ec29b9f..8bfc599a3cb7a090d96f08953cf6516312859df2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,14 +14,6 @@ all-local:   FORCE
 clean-local:   FORCE
        $(RM) test-db/[!C]* test-repl/[!C]* *core
 
-veryclean-local:       clean
+veryclean-local: FORCE
+       $(RM) -r test-db test-repl
 
-depend-local:  FORCE
-
-install-local: FORCE
-
-all-common:                    all-local
-install-common:                install-local
-clean-common:          clean-local
-veryclean-common:      veryclean-local
-depend-common:         depend-local