* scripts/abc2ly.py (try_parse_comment): idem.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 21681b64ccdf5a553134aeba4bca0223cd9de3ef..8cb53003b675e3c811327977e9d9a4e291baee0c 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,14 +16,15 @@ SUBDIRS = buildscripts python scripts \
 ## value of DOCUMENTATION here.
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
-SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
+SCRIPTS = configure autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
+TOPDOC_FILES=AUTHORS README INSTALL NEWS
+TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
+
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
 EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
-NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -32,6 +33,13 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+local-dist: dist-toplevel-txt-files
+
+dist-toplevel-txt-files:
+       -mkdir -p $(distdir)
+       ln $(TOPDOC_TXT_FILES) $(distdir)/
+       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+
 doc: 
        $(MAKE) -C Documentation
 
@@ -73,17 +81,28 @@ local-WWW-post:
 
        cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
 
+       cd $(top-build-dir) && find Documentation input \
+               $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
+               | grep -v 'lily-[0-9].*.pdf' \
+               > $(outdir)/weblist
+       ls $(outdir)/*.html >> $(outdir)/weblist
+
+## urg: this is too hairy, should write a python script to do this.
+
 ## rewrite file names so we lose out-www
        rm -rf $(outdir)/web-root/ 
-       for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \
-               echo $$d ; \
-               (mkdir -p $(outdir)/web-root/$$d/ || true) ; \
-               rsync -Wa --include source --include music-glossary \
-                       --include lilypond-internals  \
-                       --include lilypond \
-               $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \
+       mkdir $(outdir)/web-root/
+## urg slow.
+       cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
+               tar -C $(outdir)/web-root/ -xf -  
+       for dir in $(outdir)/web-root/ ; do  \
+               cd $$dir && \
+               for a in `find . -name out-www`; do \
+                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+                       rm -rf $$a ; \
+               done \
        done
-       echo $(TOPLEVEL_VERSION)> $(outdir)/web-root/VERSION 
+       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin