X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=0cd13623ca424b7f24121594cd3421f89585107b;hb=ab66ac85ea4408600dc8236c1ec752e09971ad56;hp=fb07d87eaa6add56fb36cc71e14ff84569ae7b53;hpb=34f50771ec53f5afbc49923833c32013f25fa1c2;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fb07d87eaa..0cd13623ca 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+EXTRA_DIST_FILES = VERSION .gitignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -30,14 +30,10 @@ INSTALLATION_FILES=$(config_make) VERSION
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
+LOCALSTEPMAKE_TEMPLATES=lilypond
+
 include $(depth)/make/stepmake.make
 
-#
-# suggested settings
-#
-# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
-# 
-include local.make
 
 local-dist: dist-toplevel-txt-files 
 
@@ -60,6 +56,7 @@ install-WWW:
 	rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
 	$(MAKE) -C Documentation/user local-install-WWW
 	$(MAKE) -C Documentation/user install-info
+	$(MAKE) -C input/lsr install-info
 
 install-help2man:
 	$(MAKE) -C scripts man install-help2man
@@ -89,9 +86,8 @@ 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' > $(top-build-dir)/.htaccess
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
-	rm -rf $(outdir)/online-root
-	rm -rf $(outdir)/offline-root
-	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
+	find $(outdir) -name '*-root' | xargs rm -rf
+	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
 	find $(outdir)/offline-root -type l -delete
 
 
@@ -112,11 +108,9 @@ c-clean:
 
 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-share-prefix)/lilypond-force
+web-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
-default: $(config_h) build-dir-setup 
+default: $(config_h) build-dir-setup
 
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
@@ -183,7 +177,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 	-cd $(tree-share-prefix)/fonts/tfm && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
 	-cd $(tree-share-prefix)/fonts/type1 && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+		ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
 
 TAGS.make: dummy
 	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
@@ -216,13 +210,15 @@ test:
 	$(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
-	@if  test -d .git ; then \
+	@if test -d .git ; then \
 		$(if $(shell git diff), echo "commit before base lining" && false,true) ; \
 	fi
 	$(MAKE) 
 	$(MAKE) test
-	$(MAKE) -C input/regression/ local-test-baseline
-	$(MAKE) -C input/regression/musicxml local-test-baseline
+	$(MAKE) out=test -C input/regression/ local-test-baseline
+	$(MAKE) out=test -C input/regression/musicxml local-test-baseline
+	$(MAKE) test-snippets-clean
+
 
 local-check: test
 	rm -rf $(RESULT_DIR)
@@ -238,5 +234,11 @@ test-redo:
 	done
 	$(MAKE) check
 
-test-clean:
+test-clean: test-snippets-clean
 	$(MAKE) -C input/regression/ out=test clean
+
+snippets-clean:
+	rm -rf out/lybook-db
+
+test-snippets-clean:
+	rm -rf out/lybook-testdb