mutopia move

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4137959534f98211ae5cdd1b32c7e3666258e999..75c4ed68dc7bca73327761b317554308fad901fd 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -12,8 +12,7 @@ SUBDIRS = buildscripts scripts flower lily \
        mf ly tex ps scm \
        python po make intl \
        debian $(builddir)/stepmake \
-       Documentation input \
-       mutopia 
+       Documentation input
 #
 
 SCRIPTS = configure aclocal.m4 autogen.sh
@@ -67,41 +66,33 @@ ifeq ($(KPATHSEA),0)
 endif
 
 
-TOP_HTMLS = index.html short-examples.html long-examples.html
+TOP_HTMLS = index.html examples.html
 
-short-examples: web-reqs
+examples: web-reqs
        $(MAKE) out=www -C input WWW
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
 
-long-examples: web-reqs
-       $(MAKE) out=www -C mutopia WWW
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html mutopia/
-
 lily: lily/$(outdir)/lilypond
 
 lily/$(outdir)/lilypond:
        $(MAKE) -C lily
 
-local-web: web-doc $(TOP_HTMLS:%=%) footify do-top-doc top-web
+local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
+web-ext = gz html midi pdf png txt
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
-       cd $(builddir) && find `find Documentation input mutopia -type d -name 'out-www' -print` \
-               -not -name '*.dvi' -not -name '*ly' -not -name '*.tex' \
-               -not -name '*.ps' -not -name '*.eps' -not -name '*pk' \
-               -not -name '*.aux' -not -name '*.cp' -not -name '*.fn' \
-               -not -name '*.vr' -not -name '*.yp' -not -name '*.ky' \
-               -not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \
-               -not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \
-               -not -name '*.texi' -not -name '*.texidoc' -not -name '*.tp' \
-               -not -name '*.pdfps' -not -name '*.eps.bbox' \
-               -not -name '*.log' -not -name 'out-www' -not -name '*.dep' \
-               -print \
-           > $(outdir)/weblist
+       cd $(builddir) && find Documentation input \
+               $(web-ext:%=-path '*/out-www/*.%' -or) -false \
+               > $(outdir)/weblist
        cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
        cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
-#WWW: local-WWW
+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
@@ -126,6 +117,7 @@ builddir-setup: $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force
 
 $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
        # Preparing LilyPond tree for builddir exec
+       @echo Making $(depth)/$(builddir)/share 
        @cd $(depth)/$(builddir) && rm -rf share
        @cd $(depth)/$(builddir) && mkdir -p share/lilypond
        @cd $(depth)/$(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION)
@@ -136,8 +128,12 @@ $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
                ln -s ../../../mf/$(outconfbase) tfm && \
                ln -s ../../../$(srcdir)/mf && \
                ln -s ../../../$(srcdir)/ps && \
-               ln -s ../../../$(srcdir)/scm && \
-               ln -s ../../../$(srcdir)/tex
+               ln -s ../../../$(srcdir)/scm
+       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
+               mkdir tex
+       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/tex && \
+               ln -s ../../../../$(srcdir)/tex source && \
+               ln -s ../../../../mf/$(outconfbase) generate
        @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
                mkdir fonts
        @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \
@@ -145,3 +141,7 @@ $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
                ln -s ../../../../mf/$(outconfbase) afm && \
                ln -s ../../../../mf/$(outconfbase) tfm && \
                ln -s ../../../../mf/$(outconfbase) type1
+
+local-clean: builddir-setup-clean
+builddir-setup-clean:
+       @cd $(depth)/$(builddir) && rm -rf share