]> git.donarmstrong.com Git - lilypond.git/blobdiff - GNUmakefile.in
projects / lilypond.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
diff --git a/ChangeLog b/ChangeLog
[lilypond.git] / GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 417b8f10f42f3c2f3bd5b790247256e4a61549b4..ffab58bd76996ba55cfdb697aac0430e9086b6c3 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 
 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
+
+PATCH_FILES = emacsclient.patch server.el.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
 
@@ -42,14 +50,18 @@ install-WWW:
        $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
 
+install-help2man:
+       $(MAKE) -C scripts man install-help2man
+       $(MAKE) -C lily man install-help2man
+
 web-install:
        $(MAKE) out=www install-WWW
 
 uninstall-WWW:
-       #TODO
+       echo TODO
 
 web-uninstall:
-       $(MAKE) out=www uninstall-WWW=
+       $(MAKE) out=www uninstall-WWW
 
 local-install:
        $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
@@ -72,28 +84,38 @@ local-WWW-post:
        echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
 
        cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
-       cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f
+
+       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
-       -mv $(outdir)/web-root/ $(outdir)/old-web-root
-       for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \
-               (mkdir -p $(outdir)/web-root/$$d/ || true) ; \
-               rsync -a --include source --include music-glossary \
-                       --include lilypond-internals  \
-                       --include lilypond \
-               $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \
+       rm -rf $(outdir)/web-root/ 
+       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
-## todo: use --link-dest
-#  --link-dest=$(outdir)/old-web-root/$$d
-       -rm -rf $(outdir)/old-web-root
-
+       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/current
-tree-lib-prefix = $(tree-lib)/lilypond/current
+tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
+tree-share-prefix-current = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
+tree-lib-prefix-current = $(tree-lib)/lilypond/current
 
 C_DIRS = flower lily
 c-clean:
@@ -110,7 +132,7 @@ default: $(config_h) build-dir-setup
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
-HELP_CATALOGS = $(PO_FILES:$(src-depth)/po/%.po=%)
+HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
 $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
@@ -118,7 +140,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
        mkdir -p $(tree-bin)
        mkdir -p $(tree-share-prefix)
+       ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
        mkdir -p $(tree-lib-prefix)
+       ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
        mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
@@ -163,7 +187,10 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        touch $(tree-share-prefix)/lilypond-force
 
 $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
-       -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
+       -rm -f $(tree-share-prefix)/fonts/otf/* &&  \
+       rm -f $(tree-share-prefix)/fonts/svg/* &&  \
+       rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
+       rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
                ln -s ../../../../../../mf/$(outconfbase)/*.otf .
        -cd $(tree-share-prefix)/fonts/svg && \
@@ -173,11 +200,16 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
        -cd $(tree-share-prefix)/fonts/type1 && \
                ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
-
 TAGS.make: dummy
        etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
 
-local-clean: build-dir-setup-clean
+local-clean: build-dir-setup-clean local-web-clean
+
+local-web-clean:
+       rm -rf $(outdir)/web-root/
+
+
+
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share
 
Debian packaging of lilypond