Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f70b2d44dc4bf253669d43c289fc2b2224826412..52e4a1b3142aabca6d69b4aba281bb337f56e685 100644 (file)
--- 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
@@ -32,21 +32,8 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-#
-# suggested settings
-#
-# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
-# 
-include local.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
 
@@ -96,9 +83,9 @@ local-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
+       find $(outdir) -name '*-root' | xargs rm -rf
        $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
+       find $(outdir)/offline-root -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -147,7 +134,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
@@ -161,8 +148,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
        cd $(tree-share-prefix)/tex && \
                ln -s $(top-src-dir)/tex source && \
                ln -s ../../../../../tex/$(outconfbase) tex-out && \
-               ln -s ../../../../../mf/$(outconfbase) mf-out
-
+               true
        cd $(tree-share-prefix)/fonts && \
                ln -s $(top-src-dir)/mf source && \
                true
@@ -190,7 +176,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')
@@ -213,23 +199,14 @@ $(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' 
-
+       $(MAKE) -C input/regression/ out=test local-test
+       $(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
        @if  test -d .git ; then \
@@ -237,13 +214,14 @@ test-baseline:
        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
 
 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:
@@ -254,4 +232,5 @@ test-redo:
        $(MAKE) check
 
 test-clean:
-       $(MAKE) -C input/regression/ out=$(OUT_TEST) clean
+       $(MAKE) -C input/regression/ out=test clean
+