Merge commit 'origin/master' into dev/texi2html

[lilypond.git] / stepmake / stepmake / generic-targets.make

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 250eace2f865cdb7deae0513fcde2ecf1f42db86..2df68ac3ca29746669b2677956ba5f3548cfa5f7 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,5 +1,6 @@
-.PHONY : all clean config default dist doc exe help html lib TAGS\
-        po
+.PHONY : all clean bin-clean config default dist doc exe help html lib TAGS\
+        po web web-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2\
+        web-install
 
 all:    default
        $(LOOP)
@@ -11,6 +12,16 @@ clean: local-clean
        -rm -rf "./$(outdir)"
        $(LOOP)
 
+ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES)))
+bin-clean: local-bin-clean
+       -rm -rf "./$(outdir)"
+       $(LOOP)
+else
+bin-clean:
+endif
+
+local-bin-clean: local-clean
+
 ifneq ($(strip $(depth)),.)
 dist:
        $(MAKE) -C $(depth) dist
@@ -48,6 +59,7 @@ help: generic-help local-help
        @echo -e "Generic targets:\n\
   all *       update everything except website documentation\n\
   clean *     remove all generated stuff in $(outdir)\n\
+  bin-clean * same as clean, except that mf/out is preserved\n\
   default     same as the empty target\n\
   exe         update all executables\n\
   help        this help\n\
@@ -136,10 +148,9 @@ installextradoc:
        -$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
        cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package)
 
-include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
+-include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep)
 
 $(outdir)/dummy.dep:
-       @echo please ignore innocent warning about dummy.dep
        -mkdir -p $(outdir)
        touch $(outdir)/dummy.dep
        echo '*' > $(outdir)/.gitignore
@@ -158,22 +169,31 @@ $(config_make): $(top-src-dir)/configure
        touch $@                # do something for multiple simultaneous configs.
 
 
-################ website.
+#### Documentation (website and tarball)
 
-local-WWW:
-local-WWW-post:
+# documentation is built in two stages,
+# plus WWW-post (only at toplevel)
+# see INSTALL for more information.
+
+local-WWW-1:
+local-WWW-2:
 web-install:
+WWW-post:
 
-WWW: local-WWW
+WWW-1: local-WWW-1
        $(LOOP)
 
-WWW-post: local-WWW-post
+WWW-2: local-WWW-2
        $(LOOP)
 
 web:
-       $(MAKE) out=www WWW
+       $(MAKE) out=www WWW-1
+       $(MAKE) out=www WWW-2
        $(MAKE) out=www WWW-post
 
+web-1:
+       $(MAKE) out=www WWW-1
+
 web-clean:
        find -name out-www | xargs rm -rf
        $(MAKE) out=www clean