Add cleandir target.

Using non-recursive cleandir target for resursive distclean and clean.
Avoids duplicated clean invocation during distclean.
Indent $(RM) parameters.

diff --git a/make.tmpl.in b/make.tmpl.in
index b42358a518487442a443f0497b652c0833db2bbf..58774a1eef48c6b31aa1ee13e3742530d70cc7a1 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -144,8 +144,8 @@ DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
 OBJECTS = $(SOURCES:%.c=%.o)
 POTFILES = $(SOURCES:%.c=%.pot)
 
-.PHONY: all install install_cluster pofile distclean clean cflow device-mapper 
-.PHONY: install_device-mapper install_lvm2
+.PHONY: all pofile distclean clean cleandir cflow device-mapper
+.PHONY: install install_cluster install_device-mapper install_lvm2
 .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
 .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -300,12 +300,14 @@ $(LIB_STATIC): $(OBJECTS)
 %.mo: %.po
        $(MSGFMT) -o $@ $<
 
-clean: $(SUBDIRS.clean)
+cleandir:
        $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(CLEAN_CFLOW) $(LDDEPS) \
-       $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
-       $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
+         $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
+         $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
 
-distclean: clean $(SUBDIRS.distclean)
+clean: $(SUBDIRS.clean) cleandir
+
+distclean: cleandir $(SUBDIRS.distclean)
        test -z "$(DISTCLEAN_DIRS)" || $(RM) -r $(DISTCLEAN_DIRS)
        $(RM) $(DISTCLEAN_TARGETS) Makefile core