Include local.make in all Makefiles.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b0c8d23b76b4e5e935bef1e5806f2c2ba3598cb0..ec900d6f97dd041247999a386f22afcb7cb950fc 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,7 +16,7 @@ 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 INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
@@ -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,10 +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
+       find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -148,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
@@ -247,3 +233,4 @@ test-redo:
 
 test-clean:
        $(MAKE) -C input/regression/ out=test clean
+