X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=1fc60ba8c47ac6d4ec975113c22539d782465dec;hb=6c323bc1bb27a79f687f5f3f3ed6b105aad24caa;hp=dcb196c4dc13e4412d1766410e90157895ba818a;hpb=5cf4b3a79fef86dce790f4173fa1cd1f58ebf42e;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index dcb196c4dc..1fc60ba8c4 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,9 +1,13 @@
-.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
+.PHONY : all clean bin-clean default dist exe help html lib TAGS\
+	 po doc doc-stage-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2\
+	 log-clean
 
 all:	 default
 	$(LOOP)
 
+bin:
+	$(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C lily
+
 man:
 	$(LOOP)
 
@@ -11,6 +15,9 @@ clean: local-clean
 	-rm -rf $(outdir)
 	$(LOOP)
 
+log-clean:
+	find . -name "*.log" -delete
+
 ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES)))
 bin-clean: local-bin-clean
 	-rm -rf $(outdir)
@@ -33,19 +40,13 @@ cvs-clean:
 	$(MAKE) local-distclean
 	rm -rf out
 	rm -rf out-www
-	rm -f aclocal.m4 configure
+	rm -f configure
 
 maintainerclean:
 	$(LOOP)
 	$(MAKE)	local-maintainerclean
 	$(MAKE) local-distclean
 
-
-# This doesn't allow command-line options, is it really useful? -jm
-config:
-	./$(src-depth)/configure
-
-
 generic-help:
 	@echo "Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)"
 	@echo "Usage: make ["VARIABLE=value"]... [TARGET]"
@@ -68,25 +69,20 @@ help: generic-help local-help
 	@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."
+	@echo "\`make' may be invoked from any subdirectory that contains a GNUmakefile."
 
 local-help:
 
-local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
-	mkdir -p $(distdir)/$(localdir)
-	$(LN) $(DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir)
-
-	case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
-		$(LN) $(NON_ESSENTIAL_DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir);; \
-	esac
-	case "$(OUT_DIST_FILES)x" in x) ;; *) \
-		mkdir -p $(distdir)/$(localdir)/$(outdir); \
-		$(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
+local-dist: $(OUT_DIST_FILES)
+	case "$(OUT_DIST_FILES)x" in x) ;; \
+	     *) mkdir -p $(distdir)/$(localdir)/$(outdir) && \
+	        $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
 	esac
 	$(foreach i, $(SUBDIRS), $(MAKE) top-src-dir=$(top-src-dir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
 
@@ -107,8 +103,10 @@ local-tags:
 			$(ERROR_LOG) ; \
 	fi
 
-$(outdir)/version.hh: $(depth)/VERSION $(config_make) $(step-bindir)/make-version.py
-	$(PYTHON) $(step-bindir)/make-version.py $< > $@
+# Don't use $(buildscript-dir)/make-version, because it is not known whether
+# build process has visited scripts/build
+$(outdir)/version.hh: $(depth)/VERSION $(config_make) $(top-src-dir)/scripts/build/make-version.py
+	$(PYTHON) $(top-src-dir)/scripts/build/make-version.py $< > $@
 
 $(outdir)/config.hh: $(config_h)
 	cp -p $< $@