Clean up web-clean make target

Revert ed2eeac82036c583fb1298aa21f80dff9e44ab91
"Work around 'make web-clean' madness": the problem described comes
from $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep, which is a
dependency for the makefile itself through the following line in
stepmake/stepmake/generic-targets.make:

-include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep)

The solution is to rename the ".dep" file suffix as "-dep", which this
commit does.

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 8421cc96e7c272333cdf80706d5393acf632d432..2fe267ed44f180de2f311f0b4e7e788f88e212f6 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -186,5 +186,4 @@ web:
        $(MAKE) out=www WWW-post
 
 web-clean:
-       find -name out-www | xargs rm -rf
        $(MAKE) out=www clean

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index c6e29cde73e645e1336da3dd7aadd2afff541f5d..328ef02412861c61cd746d32d0559e4c95a7ffe1 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -13,7 +13,7 @@
 # prerequisite, otherwise %.info are always outdated (because older
 # than $(outdir), hence this .dep file
 
-$(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep: $(INFO_DOCS:%=$(outdir)/%.texi)
+$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep: $(INFO_DOCS:%=$(outdir)/%.texi)
 ifneq ($(INFO_IMAGES_DIR),)
        rm -f $(INFO_IMAGES_DIR)
        ln -s $(outdir) $(INFO_IMAGES_DIR)
@@ -23,7 +23,7 @@ ifneq ($(INFO_IMAGES_DIR),)
 endif
        touch $@
 
-$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.itexi
+$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
        $(MAKEINFO) -I$(outdir) --output=$@ $<
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi
@@ -60,4 +60,5 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
        echo $(TOPLEVEL_VERSION)>> $@
        echo '@end macro'>> $@
 
-.SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi
+.SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
+  $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep