X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=2df68ac3ca29746669b2677956ba5f3548cfa5f7;hb=963e77672b51847ae37fcba76b34af728c267e8f;hp=8407cb69e0ae6662b43f0f9572c003d9f9e436ad;hpb=f436cbf790e4a6100bf2b21e4fb2ff9f3dfcc3cf;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 8407cb69e0..2df68ac3ca 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,5 +1,6 @@
-.PHONY : all clean config default diff 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
@@ -32,43 +43,39 @@ maintainerclean:
 	$(MAKE) local-distclean
 
 
-# configure:
-#
+# This doesn't allow command-line options, is it really useful? -jm
 config:
 	./$(src-depth)/configure
-#
 
 
-# target help:
-#
 generic-help:
 	@echo -e "\
 Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
 Usage: make ["VARIABLE=value"]... [TARGET]\n\
 \n\
-Targets:\n"
+Targets specific to current directory:\n"
 
 help: generic-help local-help
-	@echo -e "\
-  all         update everything\n\
-  clean       remove all generated stuff in $(outdir)\n\
-  check       run self tests\n\
+	@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\
+  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\
-  web-clean   clean \`out-www' directory\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 recurse into subdirectories;\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'.\n"
+Example: \`local-clean'."
 
-# "
 local-help:
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
@@ -141,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
@@ -163,33 +169,31 @@ $(config_make): $(top-src-dir)/configure
 	touch $@		# do something for multiple simultaneous configs.
 
 
-deb:
-	$(MAKE) -C $(depth)/debian
-	cd $(depth) && debuild
-
-diff:
-	$(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir) $(makeflags)
-	-ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
-
-release:
-	$(PYTHON) $(step-bindir)/release.py --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir)
+#### Documentation (website and tarball)
 
+# documentation is built in two stages,
+# plus WWW-post (only at toplevel)
+# see INSTALL for more information.
 
-################ website.
-
-local-WWW:
-local-WWW-post:
+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