X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=a26a8695efeb27a7df26b07b4cf754ba0300918a;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=30f82837a02765ae2a61986961271a4187ce90e7;hpb=de1be561dea4dadb2df20a0e4879821813fe9c12;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 30f82837a0..a26a8695ef 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -16,13 +16,13 @@ SUBDIRS = buildscripts python scripts \ ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure autogen.sh +SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING -TOPDOC_FILES = AUTHORS README INSTALL NEWS +TOPDOC_FILES = AUTHORS INSTALL README NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \ +EXTRA_DIST_FILES = VERSION .gitignore SConstruct \ $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -30,23 +30,12 @@ INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install -include $(depth)/make/stepmake.make +LOCALSTEPMAKE_TEMPLATES=lilypond -# -# suggested settings -# -# LILYPOND_JOBS= -djob-count=X ## for SMP/Multicore machine -# -include local.make +include $(depth)/make/stepmake.make -local-dist: dist-toplevel-txt-files dist-changelog -dist-changelog: - if test -d $(top-src-dir)/.git ; then \ - cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \ - else \ - cp $(top-src-dir)/ChangeLog $(distdir) ; \ - fi +local-dist: dist-toplevel-txt-files all: $(outdir)/VERSION @@ -67,6 +56,7 @@ install-WWW: rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir) $(MAKE) -C Documentation/user local-install-WWW $(MAKE) -C Documentation/user install-info + $(MAKE) -C input/lsr install-info install-help2man: $(MAKE) -C scripts man install-help2man @@ -92,13 +82,13 @@ final-install: # For both online and offline docs, issue `make web WEB_TARGETS="offline online"' WEB_TARGETS = offline -local-WWW-post: +WWW-post: # need UTF8 setting in case this is hosted on a website. echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/ - rm -rf $(outdir)/online-root - rm -rf $(outdir)/offline-root - $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)" + find $(outdir) -name '*-root' | xargs rm -rf + $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)" + find $(outdir)/offline-root -type l -delete tree-prefix = $(outdir) @@ -118,11 +108,9 @@ c-clean: src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh -web-clean: - $(MAKE) out=www clean - $(MAKE) $(tree-share-prefix)/lilypond-force +web-clean: snippets-clean $(tree-share-prefix)/lilypond-force -default: $(config_h) build-dir-setup +default: $(config_h) build-dir-setup build-dir-setup: $(tree-share-prefix)/lilypond-force @@ -147,7 +135,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION mkdir -p $(tree-share-prefix)/tex cd $(tree-bin) && \ ln -sf ../../lily/$(outconfbase)/lilypond . && \ - for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ + for i in abc2ly convert-ly etf2ly lilymidi lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ do ln -sf ../../scripts/$(outconfbase)/$$i . ; done cd $(tree-lib-prefix) && \ ln -s ../../../../python/$(outconfbase) python @@ -189,7 +177,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -cd $(tree-share-prefix)/fonts/tfm && \ ln -s ../../../../../../mf/$(outconfbase)/*.tfm . -cd $(tree-share-prefix)/fonts/type1 && \ - ln -s ../../../../../../mf/$(outconfbase)/*.pfa . + ln -s ../../../../../../mf/$(outconfbase)/*.pf? . TAGS.make: dummy etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') @@ -212,37 +200,31 @@ $(config_h): config.hh.in # testing RESULT_DIR=$(top-build-dir)/out/test-results -OUT_TEST=test test: - rm -f input/regression/out-$(OUT_TEST)/collated-files.html @echo -en 'For tracking crashes: use\n\n\t' @echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`' @echo - if test -d .git ; then \ - echo -e 'HEAD is:\n\n\t' ; \ - git log --max-count=1 --pretty=oneline ;\ - echo -e '\n\n\n' ; \ - git diff ; \ - fi > input/regression/out-test/tree.gittxt - $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html - @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' - rsync -L -a--exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/ + $(MAKE) -C input/regression/ out=test local-test + $(MAKE) -C input/regression/musicxml out=test local-test test-baseline: - @if test -d .git ; then \ + @if test -d .git ; then \ $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ fi $(MAKE) $(MAKE) test - rm -rf input/regression/out-test-baseline - mv input/regression/out-test input/regression/out-test-baseline + $(MAKE) out=test -C input/regression/ local-test-baseline + $(MAKE) out=test -C input/regression/musicxml local-test-baseline + $(MAKE) test-snippets-clean + local-check: test rm -rf $(RESULT_DIR) mkdir -p $(RESULT_DIR) $(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/ + @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' test-redo: @@ -252,5 +234,11 @@ test-redo: done $(MAKE) check -test-clean: - $(MAKE) -C input/regression/ out=$(OUT_TEST) clean +test-clean: test-snippets-clean + $(MAKE) -C input/regression/ out=test clean + +snippets-clean: + rm -rf out/lybook-db + +test-snippets-clean: + rm -rf out/lybook-testdb