From: John Mandereau Date: Wed, 1 Aug 2012 10:22:43 +0000 (+0200) Subject: Make distributed tarball from Git file list X-Git-Tag: release/2.17.0-1~38 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=c20fff645e325d392d2588721144f4204d0ef9da Make distributed tarball from Git file list This removes the requirement of having a GNUmakefile in each and every directory of the source tree; this commit also deletes GNUmakefiles made unnecessary this way. dist-toplevel-txt-files toplevel target is also removed, because it is unneeded outside of dist target and it prevents linking of toplevel generated txt docs to distdir when these docs are already generated. In addition, on suggestions from Han-Wen, if dist is made with a source directory tracked by Git, then * the source directory is required to have no uncommitted changes nor non-ignored untracked files, * the time stamp of all files in the tarball is set to the time stamp of the head of the checked-out branch. --- diff --git a/.gitignore b/.gitignore index e0fae2d1e4..4ee4e5154a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ Documentation/lilypond semantic.cache .lock-wscript build/ +.gitfilelist diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index b1c47c1f79..ab788379a8 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -9,10 +9,8 @@ depth = .. NAME = documentation LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py) -MANUALS_SUBDIRS = usage contributor essay \ - web learning notation extending -SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \ - included ly-examples $(LANGS) +SUBDIRS = logo pictures misc po css topdocs \ + ly-examples $(LANGS) STEPMAKE_TEMPLATES = documentation texinfo tex omf LOCALSTEPMAKE_TEMPLATES = lilypond ly @@ -33,8 +31,6 @@ IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely) SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly) OUT_SNIPPET_LY_FILES = $(SNIPPET_LY_FILES:%.ly=out/%.ly) -EXTRA_DIST_FILES = $(call src-wildcard,*.init) $(call src-wildcard,*.bst) - ### Out files # Dependencies @@ -99,7 +95,6 @@ $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node ### AJAX scripts JS_FILES = $(call src-wildcard,*.js) PHP_FILES = $(call src-wildcard,*.php) -EXTRA_DIST_FILES += $(JS_FILES) $(PHP_FILES) OUT_JS_FILES = $(JS_FILES:%.js=$(outdir)/%.js) OUT_PHP_FILES = $(PHP_FILES:%.php=$(outdir)/%.php) @@ -307,9 +302,6 @@ endif ifneq ($(ISOLANG),) new-lang-dir: mkdir -p $(ISOLANG)/$(DIR) - cp fr/GNUmakefile $(ISOLANG) - cp fr/$(DIR)/GNUmakefile $(ISOLANG)/$(DIR) - sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(ISOLANG)/$(DIR)/GNUmakefile rm -f $(outdir)/*.*tely $(outdir)/*.*texi $(PYTHON) $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) -o doc.pot --skeleton --gettext $$(cd $(ISOLANG) && ls -1 ../$(DIR).tely ../$(DIR).texi) for i in $$(cd $(outdir) && ls -1 $(DIR).tely $(DIR).texi); do\ @@ -325,6 +317,8 @@ new-lang-dir: new-lang: # Also for updating/adding missing files mkdir -p $(ISOLANG) + cp fr/GNUmakefile $(ISOLANG) + sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(foreach i,$(TRANSLATION_DIRS),$(MAKE) new-lang-dir DIR=$(i) &&) : msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot test -e po/$(ISOLANG).po || cp po/lilypond-doc.pot po/$(ISOLANG).po diff --git a/Documentation/contributor/GNUmakefile b/Documentation/contributor/GNUmakefile deleted file mode 100644 index c93c9e0624..0000000000 --- a/Documentation/contributor/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/GNUmakefile b/Documentation/cs/GNUmakefile index 97300b5296..fc9f99c56a 100644 --- a/Documentation/cs/GNUmakefile +++ b/Documentation/cs/GNUmakefile @@ -1,7 +1,5 @@ ISOLANG = cs depth = ../.. -# SUBDIRS = web learning notation texidocs usage included essay extending -SUBDIRS = web learning texidocs essay usage included STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 diff --git a/Documentation/cs/essay/GNUmakefile b/Documentation/cs/essay/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/cs/essay/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/included/GNUmakefile b/Documentation/cs/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/cs/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/learning/GNUmakefile b/Documentation/cs/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/cs/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/texidocs/GNUmakefile b/Documentation/cs/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/cs/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/usage/GNUmakefile b/Documentation/cs/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/cs/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/cs/web/GNUmakefile b/Documentation/cs/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/cs/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/css/GNUmakefile b/Documentation/css/GNUmakefile index 41495994ce..5f822237df 100644 --- a/Documentation/css/GNUmakefile +++ b/Documentation/css/GNUmakefile @@ -2,8 +2,6 @@ depth = ../.. CSS_FILES = $(call src-wildcard,*.css) -EXTRA_DIST_FILES = $(CSS_FILES) - OUT_CSS_FILES = $(CSS_FILES:%=$(outdir)/%) STEPMAKE_TEMPLATES = documentation diff --git a/Documentation/de/GNUmakefile b/Documentation/de/GNUmakefile index c31fd2fa6a..427949d751 100644 --- a/Documentation/de/GNUmakefile +++ b/Documentation/de/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = de depth = ../.. -SUBDIRS = web learning notation texidocs essay usage extending included STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/de/essay/GNUmakefile b/Documentation/de/essay/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/de/essay/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/extending/GNUmakefile b/Documentation/de/extending/GNUmakefile deleted file mode 100644 index 000480f365..0000000000 --- a/Documentation/de/extending/GNUmakefile +++ /dev/null @@ -1,4 +0,0 @@ -depth = ../../.. -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/included/GNUmakefile b/Documentation/de/included/GNUmakefile deleted file mode 100644 index dfb8d673f8..0000000000 --- a/Documentation/de/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/learning/GNUmakefile b/Documentation/de/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/de/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/notation/GNUmakefile b/Documentation/de/notation/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/de/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/texidocs/GNUmakefile b/Documentation/de/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/de/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/usage/GNUmakefile b/Documentation/de/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/de/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/de/web/GNUmakefile b/Documentation/de/web/GNUmakefile deleted file mode 100644 index 000480f365..0000000000 --- a/Documentation/de/web/GNUmakefile +++ /dev/null @@ -1,4 +0,0 @@ -depth = ../../.. -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/GNUmakefile b/Documentation/es/GNUmakefile index dc127f98c2..dc200b17b0 100644 --- a/Documentation/es/GNUmakefile +++ b/Documentation/es/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = es depth = ../.. -SUBDIRS = essay learning notation texidocs usage web extending included STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/es/essay/GNUmakefile b/Documentation/es/essay/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/essay/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/extending/GNUmakefile b/Documentation/es/extending/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/extending/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/included/GNUmakefile b/Documentation/es/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/es/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/learning/GNUmakefile b/Documentation/es/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/notation/GNUmakefile b/Documentation/es/notation/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/texidocs/GNUmakefile b/Documentation/es/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/es/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/usage/GNUmakefile b/Documentation/es/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/es/web/GNUmakefile b/Documentation/es/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/es/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/essay/GNUmakefile b/Documentation/essay/GNUmakefile deleted file mode 100644 index 068109cdcf..0000000000 --- a/Documentation/essay/GNUmakefile +++ /dev/null @@ -1,40 +0,0 @@ -depth = ../.. - -STEPMAKE_TEMPLATES=tex documentation -LOCALSTEPMAKE_TEMPLATES = lilypond ly - -OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) -EXTRA_DIST_FILES= $(BIB_FILES) $(call src-wildcard,*.bst) -BIB_FILES= $(call src-wildcard,*.bib) - -include $(depth)/make/stepmake.make - -# we no longer create bibliography files in this subdir, -# since it needs to be done in the main Documentation/ dir. -# all the below can _probably_ be removed, but I haven't -# examined it in detail. -# I think this is just going to wait until we switch to waf. -gp -dvi: $(DVI_FILES) $(OUT_BIB_FILES) - -ps: $(PS_FILES) - -default: - -GENHTMLS = engraving colorado computer-notation -OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) - -ifeq ($(out),www) -# temporary build fix; we don't know yet what's happening -# to the literature index. -gp -# local-WWW-2: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) lit-index.html) -endif - -$(outdir)/%.bib: %.bib - ln -f $< $@ - -$(outdir)/%.html: %.bib - BSTINPUTS=$(src-dir) $(buildscript-dir)/bib2html -o $@ $< - -local-clean: - rm -f fonts.aux fonts.log feta*.tfm feta*.*pk - diff --git a/Documentation/extending/GNUmakefile b/Documentation/extending/GNUmakefile deleted file mode 100644 index cab24d6a17..0000000000 --- a/Documentation/extending/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make - - diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile index d9695cbb76..420c8db9d6 100644 --- a/Documentation/fr/GNUmakefile +++ b/Documentation/fr/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = fr depth = ../.. -SUBDIRS = web learning notation texidocs usage included essay extending STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/fr/essay/GNUmakefile b/Documentation/fr/essay/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/essay/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/extending/GNUmakefile b/Documentation/fr/extending/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/extending/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/included/GNUmakefile b/Documentation/fr/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/fr/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/learning/GNUmakefile b/Documentation/fr/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/notation/GNUmakefile b/Documentation/fr/notation/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/texidocs/GNUmakefile b/Documentation/fr/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/fr/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/usage/GNUmakefile b/Documentation/fr/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/fr/web/GNUmakefile b/Documentation/fr/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/fr/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/hu/GNUmakefile b/Documentation/hu/GNUmakefile index 2205f934ad..5c04202d3b 100644 --- a/Documentation/hu/GNUmakefile +++ b/Documentation/hu/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = hu depth = ../.. -SUBDIRS = web learning texidocs usage included STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/hu/included/GNUmakefile b/Documentation/hu/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/hu/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/hu/learning/GNUmakefile b/Documentation/hu/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/hu/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/hu/texidocs/GNUmakefile b/Documentation/hu/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/hu/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/hu/usage/GNUmakefile b/Documentation/hu/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/hu/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/hu/web/GNUmakefile b/Documentation/hu/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/hu/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/included/GNUmakefile b/Documentation/included/GNUmakefile deleted file mode 100644 index 79b506e798..0000000000 --- a/Documentation/included/GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ -depth = ../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES= README -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/GNUmakefile b/Documentation/it/GNUmakefile index ac7545e342..85dc0bcc44 100644 --- a/Documentation/it/GNUmakefile +++ b/Documentation/it/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = it depth = ../.. -SUBDIRS = learning texidocs web usage included notation STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/it/included/GNUmakefile b/Documentation/it/included/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/it/included/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/learning/GNUmakefile b/Documentation/it/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/it/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/notation/GNUmakefile b/Documentation/it/notation/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/it/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/texidocs/GNUmakefile b/Documentation/it/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/it/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/usage/GNUmakefile b/Documentation/it/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/it/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/it/web/GNUmakefile b/Documentation/it/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/it/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/GNUmakefile b/Documentation/ja/GNUmakefile index 24cff45d25..54c1212969 100644 --- a/Documentation/ja/GNUmakefile +++ b/Documentation/ja/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = ja depth = ../.. -SUBDIRS = web learning texidocs usage included notation STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 diff --git a/Documentation/ja/included/GNUmakefile b/Documentation/ja/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/ja/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/learning/GNUmakefile b/Documentation/ja/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/ja/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/notation/GNUmakefile b/Documentation/ja/notation/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/ja/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/texidocs/GNUmakefile b/Documentation/ja/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/ja/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/usage/GNUmakefile b/Documentation/ja/usage/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/ja/usage/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/ja/web/GNUmakefile b/Documentation/ja/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/ja/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/learning/GNUmakefile b/Documentation/learning/GNUmakefile deleted file mode 100644 index c93c9e0624..0000000000 --- a/Documentation/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/logo/GNUmakefile b/Documentation/logo/GNUmakefile index 4a8f2eb72f..bf09cbff12 100644 --- a/Documentation/logo/GNUmakefile +++ b/Documentation/logo/GNUmakefile @@ -2,7 +2,6 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation XPM_FILES=$(call src-wildcard,*.xpm) -EXTRA_DIST_FILES= $(XPM_FILES) lilypond-icon = $(outdir)/lilypond.ico ly-icon = $(outdir)/ly.ico diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index b617fc99cd..00fe5ae826 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -5,8 +5,6 @@ NAME = documentation STEPMAKE_TEMPLATES = documentation texinfo TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9]) -EXTRA_DIST_FILES = $(TEXTS) -EXTRA_DIST_FILES += $(call src-wildcard,*.html) include $(depth)/make/stepmake.make diff --git a/Documentation/nl/GNUmakefile b/Documentation/nl/GNUmakefile index f4072b845c..d4f25727e6 100644 --- a/Documentation/nl/GNUmakefile +++ b/Documentation/nl/GNUmakefile @@ -1,6 +1,5 @@ ISOLANG = nl depth = ../.. -SUBDIRS = included web learning texidocs STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root # NO_PDF_FILES = 1 diff --git a/Documentation/nl/included/GNUmakefile b/Documentation/nl/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/nl/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/nl/learning/GNUmakefile b/Documentation/nl/learning/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/nl/learning/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/nl/texidocs/GNUmakefile b/Documentation/nl/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/nl/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/nl/web/GNUmakefile b/Documentation/nl/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/nl/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/notation/GNUmakefile b/Documentation/notation/GNUmakefile deleted file mode 100644 index c93c9e0624..0000000000 --- a/Documentation/notation/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile index 0254c26d0b..824fc66bf7 100644 --- a/Documentation/pictures/GNUmakefile +++ b/Documentation/pictures/GNUmakefile @@ -1,14 +1,10 @@ depth = ../.. -SUBDIRS = pdf - BITMAP_IMAGES = $(call src-wildcard,*.png) $(call src-wildcard,*.jpg) EPS_ILLUSTRATIONS = $(call src-wildcard,*.eps) SVG_FILES = $(call src-wildcard,*.svg) PDF_DIR = $(call src-wildcard,pdf/*.pdf) -EXTRA_DIST_FILES = $(BITMAP_IMAGES) $(EPS_ILLUSTRATIONS) $(SVG_FILES) - OUT_PDF_IMAGES = $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf) OUT_BITMAP_IMAGES = $(BITMAP_IMAGES:%=$(outdir)/%) OUT_BITMAP_IMAGES += $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.png) diff --git a/Documentation/pictures/pdf/GNUmakefile b/Documentation/pictures/pdf/GNUmakefile deleted file mode 100644 index 72ac2bcc88..0000000000 --- a/Documentation/pictures/pdf/GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ -depth = ../../.. - -PDF_FILES = $(call src-wildcard,*.pdf) - -EXTRA_DIST_FILES = $(PDF_FILES) - -STEPMAKE_TEMPLATES = documentation - -include $(depth)/make/stepmake.make - -default: - diff --git a/Documentation/snippets/GNUmakefile b/Documentation/snippets/GNUmakefile deleted file mode 100644 index cfc96feec5..0000000000 --- a/Documentation/snippets/GNUmakefile +++ /dev/null @@ -1,14 +0,0 @@ -depth = ../.. - -.PHONY: snippets - -SUBDIRS = new -EXTRA_DIST_FILES = $(call src-wildcard,*.snippet-list) \ - $(call src-wildcard,*.ly) $(call src-wildcard,*.itely) \ - README -SNIPPET_LY_FILES = $(call src-wildcard,*.ly) -OUT_SNIPPET_LY_FILES = $(SNIPPET_LY_FILES:%.ly=out/%.ly) - -include $(depth)/make/stepmake.make - -default: diff --git a/Documentation/snippets/new/GNUmakefile b/Documentation/snippets/new/GNUmakefile deleted file mode 100644 index 155e3f120f..0000000000 --- a/Documentation/snippets/new/GNUmakefile +++ /dev/null @@ -1,6 +0,0 @@ -depth = ../../.. - -EXTRA_DIST_FILES = README -EXTRA_DIST_FILES += $(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/Documentation/usage/GNUmakefile b/Documentation/usage/GNUmakefile deleted file mode 100644 index 26e33a6901..0000000000 --- a/Documentation/usage/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -LATEX_FILES =$(call src-wildcard,*.latex) -EXTRA_DIST_FILES = $(LATEX_FILES) - -include $(depth)/make/stepmake.make - - diff --git a/Documentation/web/GNUmakefile b/Documentation/web/GNUmakefile deleted file mode 100644 index 278256fb91..0000000000 --- a/Documentation/web/GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -SUBDIRS = server -include $(depth)/make/stepmake.make - -#OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) -BIB_FILES = $(call src-wildcard,*.bib) -EXTRA_DIST_FILES += $(BIB_FILES) $(call src-wildcard,*.bst) - diff --git a/Documentation/web/server/GNUmakefile b/Documentation/web/server/GNUmakefile deleted file mode 100644 index 99edf28d03..0000000000 --- a/Documentation/web/server/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth=../../.. -LOCALSTEPMAKE_TEMPLATES = ly -include $(depth)/make/stepmake.make - -EXTRA_DIST_FILES = favicon.ico robots.txt tweets.xml -EXTRA_DIST_FILES += lilypond.org.htaccess website-dir.htaccess - diff --git a/Documentation/zh/GNUmakefile b/Documentation/zh/GNUmakefile index c46b13bb43..08ecf84576 100644 --- a/Documentation/zh/GNUmakefile +++ b/Documentation/zh/GNUmakefile @@ -1,7 +1,5 @@ ISOLANG = zh depth = ../.. -# SUBDIRS = web learning notation texidocs usage included essay extending -SUBDIRS = web texidocs included STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 diff --git a/Documentation/zh/included/GNUmakefile b/Documentation/zh/included/GNUmakefile deleted file mode 100644 index afe7a4d738..0000000000 --- a/Documentation/zh/included/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) -EXTRA_DIST_FILES+=$(call src-wildcard,*.ily) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itexi) -EXTRA_DIST_FILES+=$(call src-wildcard,*.itely) - -include $(depth)/make/stepmake.make diff --git a/Documentation/zh/texidocs/GNUmakefile b/Documentation/zh/texidocs/GNUmakefile deleted file mode 100644 index 0ffa75869c..0000000000 --- a/Documentation/zh/texidocs/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth=../../.. - -EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc) - -include $(depth)/make/stepmake.make diff --git a/Documentation/zh/web/GNUmakefile b/Documentation/zh/web/GNUmakefile deleted file mode 100644 index 425cc1d8e2..0000000000 --- a/Documentation/zh/web/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../../.. - -LOCALSTEPMAKE_TEMPLATES = ly - -include $(depth)/make/stepmake.make diff --git a/GNUmakefile.in b/GNUmakefile.in index 512b8ef598..6f0e4f4a7b 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -6,7 +6,7 @@ SUBDIRS = python scripts \ flower lily \ mf ly \ tex ps scm \ - po make \ + po \ elisp vim \ input \ stepmake $(documentation-dir) @@ -26,11 +26,9 @@ IN_FILES := $(call src-wildcard,*.in) RELEASE_FILES = ChangeLog RELEASE-COMMIT RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%) OUT_DIST_FILES += $(RELEASE_OUT_FILES) -EXTRA_DIST_FILES = VERSION .gitignore .mailmap \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION - +GENERATED_BUILD_FILES=configure aclocal.m4 autogen.sh # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install @@ -40,7 +38,35 @@ include $(depth)/make/stepmake.make .PHONY: test info website -local-dist: refresh-release-files dist-toplevel-txt-files +dist: local-dist $(GENERATED_BUILD_FILES) top-doc refresh-release-files .gitfilelist + @cd $(top-src-dir) && \ + if [[ `find . -name .git` && (`git diff HEAD` || `git status | grep -i "untracked"`) ]]; \ + then echo "*** dist must been rolled on a clean git tree;"; \ + echo "uncommitted changes or untracked files detected, aborting."; \ + exit 1; fi + rm -rf $(distdir) + $(MAKE) local-dist $(distdir) + chmod -R a+r $(distdir) + chmod a+x `find $(distdir) -type d -print` + $(LN) $(TOPDOC_TXT_FILES) $(distdir) + $(LN) $(GENERATED_BUILD_FILES:%=$(src-dir)/%) .gitfilelist $(distdir) + cd $(top-src-dir) && xargs $(buildscript-dir)/mass-link hard . $(distdir) <$(top-build-dir)/.gitfilelist + if [[ `find $(top-src-dir) -name .git` ]]; then \ + COMMIT_DATE=`git --git-dir=$(top-src-dir)/.git log -1 --format=%cD`; \ + find $(distdir) | xargs touch -d "$$COMMIT_DATE"; fi + (cd ./$(depth)/$(outdir); $(TAR) -cf - --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz) + rm -rf $(distdir) + +ifneq ($(shell find $(top-src-dir) -name .git),) +.gitfilelist: $(top-src-dir)/.git/index + cd $(top-src-dir) && git ls-files >$(top-build-dir)/$@ +local-clean-filelist: + rm -f .gitfilelist +else +.gitfilelist: $(src-dir)/.gitfilelist + cp $< $@ +local-clean-filelist: +endif all: $(outdir)/VERSION @@ -65,16 +91,11 @@ python-modules: top-doc: python-modules -local-clean: local-clean-ChangeLog +local-clean: local-clean-ChangeLog local-clean-filelist local-clean-ChangeLog: rm -f ChangeLog -dist-toplevel-txt-files: top-doc - -mkdir -p $(distdir) - ln $(TOPDOC_TXT_FILES) $(distdir) - ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir) - info: $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true diff --git a/flower/GNUmakefile b/flower/GNUmakefile index 83fc5576fa..2b5b304cfa 100644 --- a/flower/GNUmakefile +++ b/flower/GNUmakefile @@ -2,11 +2,8 @@ depth = .. NAME = flower MODULE_NAME = flower -SUBDIRS = include -SCRIPTS = README_FILES = NEWS-1.0 NEWS-1.1.46 README TODO -EXTRA_DIST_FILES= VERSION $(README_FILES) $(SCRIPTS) STEPMAKE_TEMPLATES=library c++ po test # test uses LILYPOND_DATADIR diff --git a/flower/include/GNUmakefile b/flower/include/GNUmakefile deleted file mode 100644 index 3ac9dd0fa1..0000000000 --- a/flower/include/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -# flower/lib/include/Makefile - - -depth = ../.. - -STEPMAKE_TEMPLATES=c++ - -include $(depth)/make/stepmake.make - - diff --git a/input/regression/lilypond-book/GNUmakefile b/input/regression/lilypond-book/GNUmakefile index 3f27361283..935f068db7 100644 --- a/input/regression/lilypond-book/GNUmakefile +++ b/input/regression/lilypond-book/GNUmakefile @@ -7,17 +7,8 @@ include $(depth)/make/stepmake.make TITLE=lilypond-book Test Suite -SUBDIRS=include - COLLATED_FILES = $(OUT_FILES) -EXTRA_DIST_FILES = include.mxl -EXTRA_DIST_FILES += include.xml -EXTRA_DIST_FILES += $(call src-wildcard,*.ly) -EXTRA_DIST_FILES += $(call src-wildcard,*.ily) -EXTRA_DIST_FILES += $(call src-wildcard,*.tely) -EXTRA_DIST_FILES += $(call src-wildcard,*.itely) - OUT_TEXI_FILES += ${TEXI_FILES:%.texi=$(outdir)/%.info} OUT_TEXI_FILES += ${TEXI_FILES:%.texi=$(outdir)/%.pdf} OUT_TEXINFO_FILES += ${TEXINFO_FILES:%.texinfo=$(outdir)/%.info} diff --git a/input/regression/lilypond-book/include/GNUmakefile b/input/regression/lilypond-book/include/GNUmakefile deleted file mode 100644 index 0b6e885d6a..0000000000 --- a/input/regression/lilypond-book/include/GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ -depth = ../../../.. - -STEPMAKE_TEMPLATES= -LOCALSTEPMAKE_TEMPLATES= - -include $(depth)/make/stepmake.make - -EXTRA_DIST_FILES += $(call src-wildcard,*.ly) -EXTRA_DIST_FILES += $(call src-wildcard,*.ily) -EXTRA_DIST_FILES += $(call src-wildcard,*.tely) -EXTRA_DIST_FILES += $(call src-wildcard,*.itely) diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile index 65e73ea867..5d1b8fc658 100644 --- a/input/regression/musicxml/GNUmakefile +++ b/input/regression/musicxml/GNUmakefile @@ -3,8 +3,6 @@ depth = ../../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc musicxml -EXTRA_DIST_FILES = LICENSE book-musicxml-testsuite.py - TEXI2HTML_FLAGS += --nomenu COLLATED_FILES = $(sort $(MUSICXML_FILES) $(MUSICMXL_FILES) $(TEXINFO_SOURCES) ) diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 1872af74ce..abb48fe5ae 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -2,7 +2,6 @@ depth = .. NAME = lilypond -SUBDIRS = include MODULE_LIBS=$(depth)/flower MODULE_INCLUDES= $(depth)/flower/include diff --git a/lily/include/GNUmakefile b/lily/include/GNUmakefile deleted file mode 100644 index ae2bfb62f3..0000000000 --- a/lily/include/GNUmakefile +++ /dev/null @@ -1,8 +0,0 @@ -# lily/include/Makefile - -depth = ../.. -STEPMAKE_TEMPLATES=c++ - -include $(depth)/make/stepmake.make - - diff --git a/make/GNUmakefile b/make/GNUmakefile deleted file mode 100644 index 1f26abcd58..0000000000 --- a/make/GNUmakefile +++ /dev/null @@ -1,8 +0,0 @@ -depth = .. - -STEPMAKE_TEMPLATES=makedir install - -include $(depth)/make/stepmake.make - -default: spec - diff --git a/make/abc-vars.make b/make/abc-vars.make index f8fda6c5b1..ef394cd41e 100644 --- a/make/abc-vars.make +++ b/make/abc-vars.make @@ -3,5 +3,3 @@ ABC_FILES = $(call src-wildcard,*.abc) OUT_LY_FILES = $(sort ${ABC_FILES:%.abc=$(outdir)/%.ly}) OUT_FILES = $(OUT_LY_FILES) - -EXTRA_DIST_FILES += $(ABC_FILES) diff --git a/make/ly-vars.make b/make/ly-vars.make index 7d572adb75..4757ad8b57 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -12,8 +12,6 @@ ILY_FILES := $(call src-wildcard,*.ily) TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES) -EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES) - # prerequisites for all rules invoking compiled lilypond binary ifeq ($(LILYPOND_EXTERNAL_BINARY),) INIT_LY_SOURCES = $(wildcard $(top-src-dir)/scm/*.scm) diff --git a/make/midi-vars.make b/make/midi-vars.make index 7b3a27613f..8aef6eea4b 100644 --- a/make/midi-vars.make +++ b/make/midi-vars.make @@ -6,5 +6,3 @@ HEADER_FIELDS = texidoc options OUT_DIFF_FILES = ${LY_FILES:%.ly=$(outdir)/%.diff} MIDI2LY_IGNORE_RES = -I 'Lily was here' -I '^\\version ' -I 'TEXT_EVENT.*GNU LilyPond' -I '^% included from' DIFF = diff - -EXTRA_DIST_FILES += $(MIDI_FILES) $(HEADER_FILES) diff --git a/make/musicxml-vars.make b/make/musicxml-vars.make index 7706e58151..84dc36446b 100644 --- a/make/musicxml-vars.make +++ b/make/musicxml-vars.make @@ -4,5 +4,3 @@ MUSICXML_FILES = $(call src-wildcard,*.xml) MUSICMXL_FILES = $(call src-wildcard,*.mxl) # Allow .mxl for compressed files OUT_LY_FILES = $(sort ${MUSICXML_FILES:%.xml=$(outdir)/%.ly} ${MUSICMXL_FILES:%.mxl=$(outdir)/%.ly}) OUT_FILES = $(OUT_LY_FILES) - -EXTRA_DIST_FILES += $(MUSICXML_FILES) $(MUSICMXL_FILES) $(call src-wildcard,*.broken) diff --git a/python/auxiliar/GNUmakefile b/python/auxiliar/GNUmakefile index 665812d00f..b8f5edecf5 100644 --- a/python/auxiliar/GNUmakefile +++ b/python/auxiliar/GNUmakefile @@ -1,7 +1,5 @@ depth=../.. -EXTRA_DIST_FILES = $(call src-wildcard,*.py) - include $(depth)/make/stepmake.make default: diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index b3170cdbf9..f270c000e3 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=auxiliar build +SUBDIRS=build SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly midi2ly lilypond-invoke-editor musicxml2ly lilysong lilymidi diff --git a/scripts/auxiliar/GNUmakefile b/scripts/auxiliar/GNUmakefile deleted file mode 100644 index d70ff71da4..0000000000 --- a/scripts/auxiliar/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth=../.. - -EXTRA_DIST_FILES = $(call src-wildcard,*.sh) $(call src-wildcard,*.py) -EXTRA_DIST_FILES += pfx2ttf.fontforge -EXTRA_DIST_FILES += lily-git.tcl -EXTRA_DIST_FILES += ref_check.tely - -include $(depth)/make/stepmake.make - -default: diff --git a/scripts/build/GNUmakefile b/scripts/build/GNUmakefile index 5407e1adfb..5a62a47a98 100644 --- a/scripts/build/GNUmakefile +++ b/scripts/build/GNUmakefile @@ -2,8 +2,6 @@ depth = ../.. STEPMAKE_TEMPLATES=script install po -EXTRA_DIST_FILES = website-known-missing-files.txt - include $(depth)/make/stepmake.make # Should we install these? This should be handled by sysadmin or diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make index b22da2e9f5..2ca0bb97bd 100644 --- a/stepmake/stepmake/documentation-vars.make +++ b/stepmake/stepmake/documentation-vars.make @@ -1,4 +1,2 @@ at-dir = $(doc-dir) at-ext = .in - -EXTRA_DIST_FILES += $(call src-wildcard,*.ihtml) diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 9a51aaa728..45e9e8bfc7 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -81,20 +81,14 @@ help: generic-help local-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 diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index 5eba1cc214..da7d704756 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -83,7 +83,6 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES M4 = m4 -DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript) DOCDIR=$(depth)/$(outdir) #? diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make index ac5d1b6e87..7847928593 100644 --- a/stepmake/stepmake/makedir-vars.make +++ b/stepmake/stepmake/makedir-vars.make @@ -7,12 +7,8 @@ OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES))) OUTSPEC_FILES=$(addprefix $(outdir)/,$(basename $(SPEC_FILES))) OUT_DIST_FILES= $(strip $(OUTLSM_FILES) $(OUTSPEC_FILES)) -EXTRA_DIST_FILES += $(MAKE_FILES) - # these two outdir FILES are distributed, since they make sense to have # without running configure and make. at-dir = $(doc-dir) at-ext = .in - - diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make index f4d5332a92..aeb75c5f00 100644 --- a/stepmake/stepmake/metafont-vars.make +++ b/stepmake/stepmake/metafont-vars.make @@ -1,6 +1,4 @@ - MF_FILES := $(call src-wildcard,*.mf) -EXTRA_DIST_FILES += $(MF_FILES) MF_TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm)) MF_DVI_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.dvi)) MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log)) diff --git a/stepmake/stepmake/podir-vars.make b/stepmake/stepmake/podir-vars.make index b8e53f4b2c..cdb95a45e8 100644 --- a/stepmake/stepmake/podir-vars.make +++ b/stepmake/stepmake/podir-vars.make @@ -6,6 +6,3 @@ MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo)) HELP_CATALOGS = $(PO_FILES:%.po=%) CATALOGS = $(HELP_CATALOGS:$(DOMAIN)=) - -DIST_FILES += $(POT_FILES) $(PO_FILES) - diff --git a/stepmake/stepmake/python-module-vars.make b/stepmake/stepmake/python-module-vars.make index 5d0e06c127..fc6ea3fb8a 100644 --- a/stepmake/stepmake/python-module-vars.make +++ b/stepmake/stepmake/python-module-vars.make @@ -17,5 +17,3 @@ ifneq ($(DARWIN_BUILD),) SHARED_FLAGS = -bundle -flat_namespace -undefined suppress endif OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX))) -EXTRA_DIST_FILES += $(PY_MODULES_IN) - diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make index d2748a97a3..b1a05f0d0b 100644 --- a/stepmake/stepmake/toplevel-targets.make +++ b/stepmake/stepmake/toplevel-targets.make @@ -2,8 +2,6 @@ install-doc: uninstall-doc: -local-dist: configure - local-distclean: rm -f config.hh config.make Makefile GNUmakefile \ config.cache config.status config.log index.html \ @@ -44,16 +42,6 @@ ifeq ($(strip $(SRCMAKE)),) $(MAKE) final-install endif -local-dist: top-doc - -dist: - rm -rf $(distdir) - $(MAKE) local-dist $(distdir) - chmod -R a+r $(distdir) - chmod a+x `find $(distdir) -type d -print` - (cd ./$(depth)/$(outdir); $(TAR) -cf - --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz) - rm -rf $(distdir) - local-help: @echo " config rerun configure" @echo " dist roll tarball: $(depth)/$(outdir)/$(distname).tar.gz" diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make index e260f4b97b..c8c34a4e5e 100644 --- a/stepmake/stepmake/toplevel-vars.make +++ b/stepmake/stepmake/toplevel-vars.make @@ -1,7 +1,3 @@ - -# override Generic_vars.make: -DIST_FILES := $(EXTRA_DIST_FILES) - # urg? include $(stepdir)/documentation-vars.make