* scm/font.scm: remove old markup legacy

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 26eff5fc19cb5fa82ebac5dbcbe5b5373e18ab8b..6667cc4b2e726dcb48897a340b57213f3ceeaa15 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,59 +17,32 @@ SUBDIRS = buildscripts python scripts \
 #
 
 SCRIPTS = configure aclocal.m4 autogen.sh
-README_FILES =  ChangeLog  COPYING DEDICATION NEWS README.mandrake ROADMAP THANKS
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt
+README_FILES =  ChangeLog  COPYING DEDICATION README.mandrake ROADMAP THANKS
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
-INSTALLATION_FILES=$(configuration) VERSION
+INSTALLATION_FILES=$(config_make) VERSION
 
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make 
-#
-
-footify:
-       $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
-       $(footify-all-command)
-
-fonts:
-       $(MAKE) -C $(depth)/mf
 
-run-reqs: builddir-setup fonts lily
-web-reqs: run-reqs pfa-fonts
-
-doc: run-reqs
+doc: 
        $(MAKE) -C Documentation
 
-web-doc: web-reqs
-       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/regression/ WWW
-       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/template/ WWW
-       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/test/ WWW
-       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C Documentation WWW
-       $(MAKE) footify
-
 pfa-fonts:
        $(MAKE) MAKE_PFA_FILES=1 -C mf
+# don't make fontball - we have binary packages for that.
 
-
-web-doc-install: web-doc top-web
-       $(INSTALL) -m 755 -d $(local_package_docdir) 
-       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
-
-
-# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
-my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
-
+web-install: 
+       -$(INSTALL) -m 755 -d $(webdir) 
+       tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 
 local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
-ifeq ($(KPATHSEA),0)
-       $(foreach i, 1 2 3 4 5, rm -f $(local_lilypond_datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(local_lilypond_datadir)/tfm.$(i) ; )
-endif
-
 
 final-install:
        @echo
@@ -78,51 +51,36 @@ final-install:
        @echo " *** login scripts. For more information, see Invoking LilyPond in the manual."
        @echo 
 
-TOP_HTMLS = index.html examples.html
-
-examples: web-reqs
-       $(MAKE) out=www -C input WWW
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
-
-lily: lily/$(outdir)/lilypond
-
-lily/$(outdir)/lilypond:
-       $(MAKE) -C lily
+web-ext = gz html midi pdf png txt ly
 
-local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
 
+bla:
+       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
 
-web-ext = gz html midi pdf png txt ly
-top-web:
+local-WWW-post:  
+       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
+       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
        cd $(builddir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -false \
                > $(outdir)/weblist
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
-       cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
+       echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $(builddir)/index.html
+       echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(builddir)/index.html
+       cd $(builddir) && ls *.html >> $(outdir)/weblist
        cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
+
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
+
 ALL-TAGS:
        etags $(shell find . $(src-ext:%=-name '*.%' -or) -false | grep -v '/out')
 
-local-WWW:
-
-web: local-web
-html-doc: web
-index: web
-
-local-WWW-clean: top-WWW-clean
-
-WWW-clean:
-       $(MAKE) -C Documentation WWW-clean
-       $(MAKE) -C input WWW-clean
-
-top-WWW-clean:
-       cd $(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png
+web-clean:
        $(SHELL) $(buildscript-dir)/clean-fonts.sh
+       $(MAKE) out=www clean
+       $(MAKE) $(builddir)/share/lilypond-force
 
-WWW:
 
 default: $(config_h) builddir-setup
 
@@ -180,3 +138,10 @@ $(config_h): configure.in aclocal.m4
        @echo '         rm $(config_h); ./autogen.sh'
        @echo
        @false
+
+
+# maybe move into private script?
+rsync-web:
+       cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
+       cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
+       cd out-www && rm -rf web/