X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=e5f9f0cdf57cee69535bf51e3e08c530462815fc;hb=9087de1c637fc042ae3cbda8174a4ee9131cc523;hp=9bf8f5caa3a6d2bf49ca62aebea5e49b3ea96a76;hpb=125c505b0b8e664b9df2f11718fa6ffca6806060;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9bf8f5caa3..e5f9f0cdf5 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -6,79 +6,168 @@
 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 python scripts \
+	elisp \
+	flower kpath-guile ttftool lily \
+	mf ly tex ps scm \
+	po make \
+	cygwin debian stepmake \
+	Documentation input \
+	vim 
 #
 
-SCRIPTS = configure aclocal.m4
-README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
+#include VERSION
+#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+
+SCRIPTS = configure aclocal.m4 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
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES) 
+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=$(datadir)
-INSTALLATION_FILES=$(builddir)/config.make VERSION
+INSTALLATION_DIR=$(local_lilypond_datadir)
+INSTALLATION_FILES=$(config_make) 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
+doc: 
+	$(MAKE) -C Documentation
 
-footify:
-	$(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
-	$(footify-all-command)
+install-WWW:
+	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) 
+	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
+# install-WWW does not recurse; fake it visiting Documentation/user manually
+	$(MAKE) -C Documentation/user local-install-WWW
+	$(MAKE) -C Documentation/user install-info
 
-fonts:
-	$(MAKE) -C $(depth)/mf 
+web-install:
+	$(MAKE) out=www install-WWW
 
-doc:
-	$(MAKE) -C Documentation
+uninstall-WWW:
+	#TODO
 
-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)
-
-# don't understand this comment --hwn
-
-# 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 
+web-uninstall:
+	$(MAKE) out=www uninstall-WWW=
 
 local-install:
-	mkdir -p $(datadir)
-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
+	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
+
+final-install:
+	@true
+
+web-ext = html midi pdf png txt ly
+
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footifymail = MAILADDRESS=bug-lilypond@gnu.org
+
+local-WWW-post:
+# need UTF8 setting in case this is hosted on a website. 
+	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(builddir)/.htaccess
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
+	cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
+	cd $(builddir) && find . -name \*.html~ -print | xargs rm -f
+	cd $(builddir) && find Documentation input \
+		$(web-ext:%=-path '*/out-www/*.%' -or) -type l \
+		> $(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 -)
+
+share-prefix = $(builddir)/share
+tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)
+
+src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
+
+web-clean:
+	$(MAKE) out=www clean
+	$(MAKE) $(tree-prefix)/lilypond-force
+
+default: $(config_h) builddir-setup 
+
+builddir-setup: $(tree-prefix)/lilypond-force
+
+PO_FILES = $(wildcard $(srcdir)/po/*.po)
+HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
+CATALOGS = $(HELP_CATALOGS:lilypond=) 
+
+$(tree-prefix)/lilypond-force link-tree: GNUmakefile
+# Preparing LilyPond tree for builddir exec
+	cd $(builddir) && rm -rf lib share
+	mkdir -p $(builddir)/lib/$(package)
+	mkdir -p $(tree-prefix)
+	mkdir -p $(tree-prefix)/dvips
+	mkdir -p $(tree-prefix)/elisp
+	mkdir -p $(tree-prefix)/fonts
+	mkdir -p $(tree-prefix)/fonts/otf
+	mkdir -p $(tree-prefix)/fonts/tfm
+	mkdir -p $(tree-prefix)/fonts/type1
+	mkdir -p $(tree-prefix)/fonts/svg
+	mkdir -p $(tree-prefix)/fonts/map
+	mkdir -p $(tree-prefix)/fonts/enc
+	mkdir -p $(tree-prefix)/tex
+	cd $(builddir)/lib && \
+		ln -s  ../../../python/$(outconfbase) python
+	cd $(tree-prefix) && \
+		ln -s $(abs-srcdir)/ly ly && \
+		ln -s $(abs-srcdir)/ps && \
+		ln -s ../../../python/$(outconfbase) python && \
+		ln -s $(abs-srcdir)/scm && \
+		ln -s $(abs-srcdir)/scripts scripts
+	cd $(tree-prefix)/dvips && \
+		ln -s ./../../mf/$(outconfbase) mf-out && \
+		ln -s $(abs-srcdir)/ps
+	cd $(tree-prefix)/tex && \
+		ln -s $(abs-srcdir)/tex source && \
+		ln -s ../../../../tex/$(outconfbase) tex-out && \
+		ln -s ../../../../mf/$(outconfbase) mf-out
+	cd $(tree-prefix)/fonts/enc && \
+		ln -s ../../../../../mf/$(outconfbase)/*.enc .
+	cd $(tree-prefix)/fonts/map && \
+		ln -s ../../../../../mf/$(outconfbase)/*.map .
+	cd $(tree-prefix)/fonts/otf && \
+		ln -s ../../../../../mf/$(outconfbase)/*.otf .
+	cd $(tree-prefix)/fonts/svg && \
+		ln -s ../../../../../mf/$(outconfbase)/*.svg .
+	cd $(tree-prefix)/fonts/tfm && \
+		ln -s ../../../../../mf/$(outconfbase)/*.tfm .
+	cd $(tree-prefix)/fonts/type1 && \
+		ln -s ../../../../../mf/$(outconfbase)/*.pfa .
+	cd $(tree-prefix)/fonts && \
+		ln -s $(abs-srcdir)/mf source && \
+		true
+	cd $(tree-prefix)/elisp && \
+		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
+		ln -s $(abs-srcdir)/elisp/*.el .
+	$(foreach i,$(CATALOGS), \
+		mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \
+		cd $(share-prefix)/locale/$i/LC_MESSAGES && \
+		ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
+#	touch $@
+	touch $(tree-prefix)/lilypond-force
+
+local-clean: builddir-setup-clean
+builddir-setup-clean:
+	cd $(builddir) && rm -rf share
+
+$(config_h): config.hh.in
+#
+# this is to prevent people from getting
+# undefined symbols  when we add them to config.h.in,
+# and they blindly run "cvs update; make".
+#
+	@echo
+	@echo ' *** $(config_h) is out of date'
+	@echo ' *** Remove it and rerun autogen:'
+	@echo '         rm $(config_h); ./autogen.sh'
+	@echo
+	@false
 
-local-WWW-clean:
-	$(SHELL) $(buildscript-dir)/clean-fonts.sh