X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=fa7dc2e104d4ad47ee60b891dd77ecdf75df8637;hb=4fec19bb131b237b533018c863b89bcca5ab0eb4;hp=8421cc96e7c272333cdf80706d5393acf632d432;hpb=74ef2b1c90d1b9bd0e40fbcfc4efd53c16770cbd;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 8421cc96e7..fa7dc2e104 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,19 +1,22 @@
-.PHONY : all clean bin-clean config default dist doc exe help\
-         html lib TAGS po
+.PHONY : all clean bin-clean config default dist exe help html lib TAGS\
+	 po doc doc-stage-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2
 
 all:	 default
 	$(LOOP)
 
+bin:
+	$(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C lily
+
 man:
 	$(LOOP)
 
 clean: local-clean
-	-rm -rf "./$(outdir)"
+	-rm -rf $(outdir)
 	$(LOOP)
 
 ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES)))
 bin-clean: local-bin-clean
-	-rm -rf "./$(outdir)"
+	-rm -rf $(outdir)
 	$(LOOP)
 else
 bin-clean:
@@ -27,7 +30,6 @@ dist:
 endif
 
 distclean: clean
-	$(LOOP)
 	$(MAKE) local-distclean
 
 cvs-clean:
@@ -48,33 +50,34 @@ config:
 
 
 generic-help:
-	@echo -e "\
-Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
-Usage: make ["VARIABLE=value"]... [TARGET]\n\
-\n\
-Targets specific to current directory:\n"
+	@echo "Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)"
+	@echo "Usage: make ["VARIABLE=value"]... [TARGET]"
+	@echo
+	@echo "Targets specific to current directory:"
 
 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\
-  install *   install programs and data (prefix=$(prefix))\n\
-  uninstall*  uninstall programs and data\n\
-  lib         update all libraries\n\
-  web *       update website in directory \`out-www'\n\
-  web-install * install website documentation in (webdir=$(webdir))\n\
-              and Info documentation with images\n\
-  web-clean * clean \`out-www' directory\n\
-  TAGS        generate tagfiles\n\
-\n\
-\`make' may be invoked from any subdirectory.\n\
-Note that all commands marked with a star (*) recurse into subdirectories;\n\
-prepend \`local-' to restrict operation to the current directory.\n\
-Example: \`local-clean'."
+	@echo "Generic targets that recurse into subdirectories*:"
+	@echo "  all          update everything except documentation with images"
+	@echo "  clean        remove all generated stuff in $(outdir)"
+	@echo "  bin-clean    same as clean, except that mf/out is preserved"
+	@echo "  doc          update documentation with images in directory \`out-www'"
+	@echo "  doc-stage-1  update only PDF and Info documentation in directory \`out-www'"
+	@echo "  doc-clean    clean \`out-www' directory"
+	@echo "  install      install programs and data (prefix=$(prefix))"
+	@echo "  uninstall    uninstall programs and data"
+	@echo
+	@echo "  *Note: Prepend \`local-' (eg. \`local-clean') to restrict"
+	@echo "         any of the above commands to the current directory."
+	@echo
+	@echo "Other generic targets:"
+	@echo "  default      same as the empty target"
+	@echo "  bin          check the lily directory and rebuild lilypond.exe if needed"
+	@echo "  exe          update all executables"
+	@echo "  help         this help"
+	@echo "  lib          update all libraries"
+	@echo "  TAGS         generate tagfiles"
+	@echo
+	@echo "\`make' may be invoked from any subdirectory."
 
 local-help:
 
@@ -169,22 +172,36 @@ $(config_make): $(top-src-dir)/configure
 	touch $@		# do something for multiple simultaneous configs.
 
 
-################ website.
+#### Documentation (website and tarball)
 
-local-WWW:
-local-WWW-post:
-web-install:
+# documentation is built in two stages,
+# plus WWW-post (only at toplevel)
+# see INSTALL for more information.
 
-WWW: local-WWW
+ifeq ($(out),www)
+local-WWW-1:
+local-WWW-2:
+WWW-post:
+
+WWW-1: local-WWW-1
 	$(LOOP)
 
-WWW-post: local-WWW-post
+WWW-2: local-WWW-2
 	$(LOOP)
+endif
 
-web:
-	$(MAKE) out=www WWW
+doc: doc-stage-1
+	$(MAKE) out=www WWW-2
 	$(MAKE) out=www WWW-post
 
-web-clean:
-	find -name out-www | xargs rm -rf
+local-doc:
+	$(MAKE) out=www local-WWW-1
+	$(MAKE) out=www local-WWW-2
+	$(MAKE) out=www WWW-post
+
+doc-stage-1:
+	$(MAKE) -C $(depth)/scripts/build out=
+	$(MAKE) out=www WWW-1
+
+doc-clean:
 	$(MAKE) out=www clean