X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=fa7dc2e104d4ad47ee60b891dd77ecdf75df8637;hb=dcbac367ac2ff45a4cdbe48feb7438f2d778ddbb;hp=d9501521085f376c9fb0e6ef06c521964c09c27a;hpb=3a710887f601ee7cd2e1d388bd9f1ece576cf8f6;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index d950152108..fa7dc2e104 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -4,16 +4,19 @@
 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,32 +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 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\
-  uninstall*  uninstall programs and data\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:
 
@@ -164,17 +168,9 @@ $(config_make): $(top-src-dir)/configure
 	@echo "************************************************************"
 	@echo "configure changed! You should probably reconfigure manually."
 	@echo "************************************************************"
-# do something for multiple simultaneous configs.
 	(cd $(top-build-dir); ./config.status)
-	touch $@
+	touch $@		# do something for multiple simultaneous configs.
 
-$(top-src-dir)/configure: $(top-src-dir)/configure.in \
- $(top-src-dir)/stepmake/aclocal.m4
-	@echo "************************************************************"
-	@echo "configure.in and/or stepmake/aclocal.m4 changed!"
-	@echo "Please regenerate configure with autogen.sh."
-	@echo "************************************************************"
-	@false
 
 #### Documentation (website and tarball)