Commit 475fd6dc authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

"make veryclean" now lives up to its name.

parent 3baad5c2
......@@ -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
......
......@@ -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)
......
......@@ -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 \
......
......@@ -133,6 +133,7 @@ lint5-local:
veryclean: FORCE
$(RM) Makefile
$(RM) -r .libs
Makefile: Makefile.in $(top_srcdir)/build/top.mk
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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 > $@)
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 > $@)
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 > $@)
......@@ -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= ; \
......
......@@ -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 \
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment