X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=41f96567c73408d5c7c1b6b054f79b8656846f72;hb=767d065b18c24ce86fed42e4c2112116892cdbf3;hp=28c4a46ca3d513c36f1c6896d3565f3c43a70040;hpb=f4f2cbb7172ef126a0097d62bfcf0bea0510d723;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 28c4a46ca3..41f96567c7 100644
--- 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,10 +59,12 @@ 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\
@@ -136,10 +149,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,21 +170,30 @@ $(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
+web: web-1
+	$(MAKE) out=www WWW-2
 	$(MAKE) out=www WWW-post
 
+web-1:
+	$(MAKE) -C $(depth)/scripts/build out=
+	$(MAKE) out=www WWW-1
+
 web-clean:
 	$(MAKE) out=www clean