X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=1313689a2c8815dbdc3b67f34d620ef9e3c50cf6;hb=e63ea5ba4dfc0ecf69e0211dc0327503dfc05037;hp=eaff8f986de245fe96562201d4b6a2adeef694b5;hpb=87932dcb8ec24b069bbce8edbb76f5258ca4ff1b;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index eaff8f986d..1313689a2c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -6,72 +6,49 @@
 depth = .
 #
 
-# descent order into subdirectories:
-#
-SUBDIRS =  buildscripts scripts  flower lily mf midi2ly po debian \
-	Documentation ly input tex make mutopia intl $(builddir)/stepmake\
-	ps  scm
+# descent order into subdirectories
+# 
+SUBDIRS = buildscripts scripts flower lily \
+	mf ly tex ps scm \
+	python po make intl \
+	debian $(builddir)/stepmake \
+	Documentation input \
+	mutopia 
 #
 
-SCRIPTS = configure aclocal.m4
-README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
+SCRIPTS = configure aclocal.m4 autogen.sh
+README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION
 
 # bootstrap stepmake:
 #
-STEPMAKE_TEMPLATES=toplevel yolily-toplevel po install
+STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make 
 #
 
-website: fonts htmldoc examples  footify
-
 footify:
 	$(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
 	$(footify-all-command)
 
+
 fonts:
-	$(MAKE) -C $(depth)/mf 
+	$(MAKE) -C $(depth)/mf
 
-doc:
+doc: lily fonts
 	$(MAKE) -C Documentation
 
-htmldoc: 
-	$(MAKE) out='www' local-WWW
-	$(MAKE) out='www' -C Documentation WWW
-	rm -f `find . -name \*.html~ -print`
-	$(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
-	$(footify-all-command)
-	find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www'  > wwwlist
-	tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.png $(ERRORLOG)`  index.html
-
-examples:
-	$(MAKE) out='www' -C input WWW
-	$(MAKE) out='www' -C mutopia WWW
-# arg, should not break concept of recursive make;
-# this breaks links (and dependencies, see above)
+web-doc: pfa-fonts
+	$(MAKE) out=www -C Documentation WWW
+	$(MAKE) footify
 
-# don't understand this comment --hwn
+# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
+my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
-# See below.  The footify-all you had before caused dead links on the
-# webpage, because the footify command assumes it can calculate the location
-# of index.html from the current depth.  That doesn't work, if you don't
-# use recursive make like we do everywhere else; leads to bugs that you
-# make a specific fix for.
-
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
-#$(footify-all-command)
-	$(footify) --index=./ `$(FIND) . -name '*.html' -print`
-	tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html  `find input mutopia -type d -name 'out-www' -print`
-
-# Kpathsea is overkill, and a horror/impossible to compile without compiling
-# and using a matching TeX (well, I gave up trying for now).
-my_tfm_path=$(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
 local-install:
 	mkdir -p $(datadir)
@@ -79,6 +56,69 @@ ifeq ($(KPATHSEA),0)
 	$(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
 endif
 
-local-WWW-clean:
+
+TOP_HTMLS = index.html short-examples.html long-examples.html
+
+index: web-doc
+
+short-examples: pfa-fonts
+	$(MAKE) out=www -C input WWW
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
+
+
+long-examples: pfa-fonts
+	$(MAKE) out=www -C mutopia WWW
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
+
+pfa-fonts:
+	$(MAKE) MAKE_PFA_FILES=1 -C mf
+
+lily: lily/$(outdir)/lilypond
+
+lily/$(outdir)/lilypond:
+	$(MAKE) -C lily
+
+local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+
+top-web:
+	rm -f `find . -name \*.html~ -print`
+	find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` \
+		-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 '*.log' -not -name 'out-www' -not -name '*.dep' \
+	    > $(outdir)/weblist
+	ls *.png *.html >> $(outdir)/weblist
+	cat $(outdir)/weblist | GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -
+
+#WWW: local-WWW
+
+web: local-web
+
+local-WWW-clean: top-WWW-clean
+
+WWW-clean:
+	$(MAKE) -C Documentation WWW-clean
+	$(MAKE) -C input WWW-clean
+	$(MAKE) -C mutopia WWW-clean
+
+top-WWW-clean:
+	rm -f $(TOP_HTMLS) lily-[0-9]*.png
 	$(SHELL) $(buildscript-dir)/clean-fonts.sh
 
+
+
+WWW:
+
+fontpaths:
+	-ln -s $(depth)/mf/out dvips
+	-mkdir -p fonts
+	-rm fonts/source
+	-ln -s ../$(depth)/mf fonts/source
+	-ln -s ../$(depth)/mf/out fonts/afm
+	-ln -s ../$(depth)/mf/out fonts/tfm
+	-ln -s ../$(depth)/mf/out fonts/type1