X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=a36faaeb2360a079498748fac63dcfe9c0f031cf;hb=5532801f30af2000fa4085e2e3853efe2f6b095b;hp=24f8f65aed78931837c548d82132f4b3dae5f68e;hpb=7281bce4e6aff8ba87081c4d397434bc745d1241;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 24f8f65aed..a36faaeb23 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,5 +1,5 @@
-.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)
@@ -56,18 +56,18 @@ Targets specific to current directory:\n"
 
 help: generic-help local-help
 	@echo -e "Generic targets:\n\
-  all *       update everything except website documentation\n\
+  all *       update everything except documentation with images\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\
+  doc *       update documentation with images in directory \`out-www'\n\
+  doc-stage-1 * update only PDF and Info documentation in directory \`out-www'\n\
+  doc-clean * clean \`out-www' directory\n\
   exe         update all executables\n\
   help        this help\n\
   install *   install programs and data (prefix=$(prefix))\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\
+  uninstall*  uninstall programs and data\n\
   TAGS        generate tagfiles\n\
 \n\
 \`make' may be invoked from any subdirectory.\n\
@@ -168,22 +168,31 @@ $(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
+doc-stage-1:
+	$(MAKE) -C $(depth)/scripts/build out=
+	$(MAKE) out=www WWW-1
+
+doc-clean:
 	$(MAKE) out=www clean