Language makefile tweaks.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e85f61dd035426e3df71aa653415c48c2c71e7db..d500c09ea60f24ab61e58181c042f8bee9c9589b 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -29,19 +29,18 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 txt-to-html:
        $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
 
+ifneq ($(ISOLANG),)
 new-lang:
        @if (( $$(file -b $(ISOLANG)) == directory )) 2>/dev/null; \
        then echo "Error: $(ISOLANG) directory already exists. Exiting." ; \
        exit 3 ; \
        fi
        mkdir -p $(ISOLANG)/user
-       echo "ISOLANG = $(ISOLANG)" > $(ISOLANG)/GNUmakefile
-       echo "depth = ../$(depth)" >> $(ISOLANG)/GNUmakefile
-       echo -e "\ninclude \$$(depth)/make/doc-lang/root.make\n" >> $(ISOLANG)/GNUmakefile
-       echo "ISOLANG = $(ISOLANG)" > $(ISOLANG)/user/GNUmakefile
-       echo "depth = ../../$(depth)" >> $(ISOLANG)/user/GNUmakefile
-       echo -e "\ninclude \$$(depth)/make/doc-lang/user.make\n" >> $(ISOLANG)/user/GNUmakefile
+       cp fr/GNUmakefile $(ISOLANG)
+       cp fr/user/GNUmakefile $(ISOLANG)/user
+       sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(ISOLANG)/user/GNUmakefile
        $(PYTHON) $(depth)/buildscripts/texi-langutils.py -d $(outdir) -b "UNTRANSLATED NODE: IGNORE ME" -o doc.pot --skeleton --gettext ../user/lilypond.tely
        mv $(outdir)/*.*tely $(ISOLANG)/user
        msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot
        cp po/lilypond-doc.pot po/$(ISOLANG).po
+endif
\ No newline at end of file

diff --git a/make/doc-lang/root.make b/make/doc-lang/root.make
deleted file mode 100644 (file)
index 22000df..0000000
--- a/make/doc-lang/root.make
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = user
-STEPMAKE_TEMPLATES = documentation
-
-include $(depth)/make/stepmake.make

diff --git a/make/doc-lang/user.make b/make/doc-lang/user.make
deleted file mode 100644 (file)
index b1689b1..0000000
--- a/make/doc-lang/user.make
+++ /dev/null
@@ -1,61 +0,0 @@
-# assumes depth and ISOLANG are defined
-
-OUT_ITEXI_FILES = $(ITELY_FILES:%.itely=$(outdir)/%.itexi)
-
-
-STEPMAKE_TEMPLATES = texinfo
-LOCALSTEPMAKE_TEMPLATES = lilypond ly
-
-include $(depth)/make/stepmake.make
-
-LILYPOND_BOOK_INCLUDES += \
-  -I$(depth)/Documentation/$(ISOLANG) \
-  -I$(depth)/Documentation/user \
-  -I$(builddir)/Documentation/user/$(outdir)
-
-default: 
-
-$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
-
-MAKEINFO = LANG=$(ISOLANG) $(MAKEINFO_PROGRAM) --force
-
-$(outdir)/lilypond/index.html: $(outdir)/lilypond.nexi doc-po
-       mkdir -p $(dir $@)
-       -$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(depth)/Documentation/texinfo.css --html $<
-       find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(depth)/buildscripts/html-gettext.py $(depth)/Documentation/po/$(outdir) $(ISOLANG)
-
-$(outdir)/lilypond.html: $(outdir)/lilypond.nexi
-       -$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(depth)/Documentation/texinfo.css --html --no-split --no-headers $< 
-
-local-WWW: png-ln $(outdir)/lilypond.html $(outdir)/lilypond/index.html deep-ln lang-merge
-
-lang-merge:
-       $(foreach i, $(shell find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME'), ln -f $(i) $(i:$(outdir)/%.html=$(depth)/Documentation/user/$(outdir)/%.$(ISOLANG).html) &&) true
-
-png-ln:
-       mkdir -p $(outdir)/lilypond
-       # makeinfo is broken, it MUST have PNGs in output dir
-       # symlinking PNGs...
-       @$(foreach i, $(shell find $(depth)/Documentation/user/$(outdir) -maxdepth 1 -name '*.png'), ln -sf ../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
-       @$(foreach i, $(shell find $(depth)/Documentation/user/$(outdir)/lilypond -name '*.png'), ln -sf ../../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
-
-# Links referred to by Documentation index
-# BROKEN: the following makes broken symlinks
-#LILYPOND_LINKS = Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
-
-
-deep-ln:
-       mkdir -p $(outdir)/lilypond
-       cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
-                rm -f $(i) && ln -s lilypond.html $(i) &&) true
-
-local-WWW-clean: deep-WWW-clean
-
-deep-WWW-clean:
-       rm -rf $(outdir)/lilypond
-
-web-clean: clean
-       $(MAKE) out=www local-WWW-clean
-
-doc-po:
-       $(MAKE) -C $(depth)/Documentation/po messages

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/make/doclang-targets.make b/make/doclang-targets.make
new file mode 100644 (file)
index 0000000..ae01f34
--- /dev/null
+++ b/make/doclang-targets.make
@@ -0,0 +1,55 @@
+# assumes depth and ISOLANG are defined
+
+OUT_ITEXI_FILES = $(ITELY_FILES:%.itely=$(outdir)/%.itexi)
+
+LILYPOND_BOOK_INCLUDES += \
+  -I$(depth)/Documentation/$(ISOLANG) \
+  -I$(depth)/Documentation/user \
+  -I$(builddir)/Documentation/user/$(outdir)
+
+default: 
+
+$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
+
+MAKEINFO = LANG=$(ISOLANG) $(MAKEINFO_PROGRAM) --force
+
+$(outdir)/lilypond/index.html: $(outdir)/lilypond.nexi doc-po
+       mkdir -p $(dir $@)
+       -$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(depth)/Documentation/texinfo.css --html $<
+       find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(depth)/buildscripts/html-gettext.py $(depth)/Documentation/po/$(outdir) $(ISOLANG)
+
+$(outdir)/lilypond.html: $(outdir)/lilypond.nexi
+       -$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(depth)/Documentation/texinfo.css --html --no-split --no-headers $< 
+
+local-WWW: png-ln $(outdir)/lilypond.html $(outdir)/lilypond/index.html deep-ln lang-merge
+
+lang-merge:
+       $(foreach i, $(shell find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME'), ln -f $(i) $(i:$(outdir)/%.html=$(depth)/Documentation/user/$(outdir)/%.$(ISOLANG).html) &&) true
+
+png-ln:
+       mkdir -p $(outdir)/lilypond
+       # makeinfo is broken, it MUST have PNGs in output dir
+       # symlinking PNGs...
+       $(foreach i, $(shell find $(depth)/Documentation/user/$(outdir) -maxdepth 1 -name '*.png'), ln -sf ../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
+       $(foreach i, $(shell find $(depth)/Documentation/user/$(outdir)/lilypond -name '*.png'), ln -sf ../../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
+
+# Links referred to by Documentation index
+# BROKEN: the following makes broken symlinks
+#LILYPOND_LINKS = Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
+
+
+deep-ln:
+       mkdir -p $(outdir)/lilypond
+       cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
+                rm -f $(i) && ln -s lilypond.html $(i) &&) true
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+       rm -rf $(outdir)/lilypond
+
+web-clean: clean
+       $(MAKE) out=www local-WWW-clean
+
+doc-po:
+       $(MAKE) -C $(depth)/Documentation/po messages

diff --git a/make/doclang-vars.make b/make/doclang-vars.make
new file mode 100644 (file)
index 0000000..e69de29