X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=2cd9723edc0191ab2f90c469be18b1c1d8148f8f;hb=82e1937780c911be71b439a7d1f2006f058f0490;hp=d61620209294bf281741f8d81fcdd9239544dab9;hpb=2e8af646c57285dc4946205ddab0257bc4ef6270;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d616202092..2cd9723edc 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -38,6 +38,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 
 include $(depth)/make/stepmake.make
 
+.PHONY: test info website
 
 local-dist: refresh-release-files dist-toplevel-txt-files
 
@@ -117,13 +118,34 @@ uninstall-WWW:
 # For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
-WWW-post:
+WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html)
+
+WEB_EXAMPLE_FILES = $(wildcard input/$(outdir)/*.ly) \
+                    $(wildcard input/*/$(outdir)/*.ly) \
+                    $(wildcard input/*/*/$(outdir)/*.ly)
+
+WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \
+                    $(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \
+                    $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo input/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")
+
+WWW-post: $(top-build-dir)/.htaccess $(outdir)/examples.html $(WEB_ROOT_FILES)
+
 # need UTF8 setting in case this is hosted on a website.
+$(top-build-dir)/.htaccess:
 	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
+
+$(outdir)/examples.html: $(WEB_EXAMPLE_FILES)
 	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
-	find $(outdir) -name '*-root' | xargs rm -rf
-	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
+
+$(outdir)/offline-root/index.html: $(WEB_TRACKED_FILES)
+	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) offline
 	find $(outdir)/offline-root -type l | xargs rm -f
+
+$(outdir)/online-root/index.html: $(WEB_TRACKED_FILES)
+	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) online
 endif # ifeq ($(out),www)
 
 # For those who cannot for the life in them remember to type
@@ -150,16 +172,21 @@ src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
 doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
-default: $(config_h) build-dir-setup
+default: $(config_h) build-dir-setup build-scripts
 
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
+build-scripts:
+	$(MAKE) -C scripts/build
+
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=)
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 # Preparing LilyPond tree for build-dir exec
+link-tree: $(tree-share-prefix)/lilypond-force
+
+$(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
 	mkdir -p $(tree-share-prefix)
@@ -202,7 +229,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 		ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
 	touch $(tree-share-prefix)/lilypond-force
 
-$(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
+link-mf-tree: $(tree-share-prefix)/mf-link-tree
+
+$(tree-share-prefix)/mf-link-tree: $(tree-share-prefix)/lilypond-force
 	-rm -f $(tree-share-prefix)/fonts/otf/* &&  \
 	rm -f $(tree-share-prefix)/fonts/svg/* &&  \
 	rm -f $(tree-share-prefix)/fonts/fonts.conf &&  \
@@ -220,6 +249,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
 	-cd $(tree-share-prefix)/fonts/type1 && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
+	touch $(tree-share-prefix)/mf-link-tree
 
 TAGS.make: dummy
 	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')