diff options
author | John Mandereau <john.mandereau@gmail.com> | 2012-08-01 12:22:43 +0200 |
---|---|---|
committer | John Mandereau <john.mandereau@gmail.com> | 2012-08-15 16:22:08 +0200 |
commit | c20fff645e325d392d2588721144f4204d0ef9da (patch) | |
tree | b9950400bcd9493bb41e24bb2e9c873e544d088e /make | |
parent | c0a47b91cd930053074d42363047a77b889e05f7 (diff) |
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.
Diffstat (limited to 'make')
-rw-r--r-- | make/GNUmakefile | 8 | ||||
-rw-r--r-- | make/abc-vars.make | 2 | ||||
-rw-r--r-- | make/ly-vars.make | 2 | ||||
-rw-r--r-- | make/midi-vars.make | 2 | ||||
-rw-r--r-- | make/musicxml-vars.make | 2 |
5 files changed, 0 insertions, 16 deletions
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) |