* Some ly2dvi updates.
* Junked cruft from makefiles.
1.3.140.jcn4
============
1.3.140.jcn4
============
+* Some ly2dvi updates.
+
+* Junked cruft from makefiles.
+
+1.3.140.jcn4
+============
+
* Added message about make help at end of configure.
* Some documentation updates.
#urg default local-WWW target uses footify before its time;
# must add footify with txt-to-html target
-local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html
+local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html
copy-for-me:
$(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true
depth = ../..
-STEPMAKE_TEMPLATES=documentation tex texinfo yolily-topdoc
+STEPMAKE_TEMPLATES=documentation tex texinfo
LOCALSTEPMAKE_TEMPLATES=lilypond ly
HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html))
+#default: local-doc
include $(depth)/make/stepmake.make
-local-WWW: $(HTML_FILES)
+copy-to-top: $(TO_TOP_FILES)
+ $(foreach i, $(TO_TOP_FILES), \
+ cp $(i) $(depth)/ && ) true
+ -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website
+
+###local-WWW: copy-to-top
+
+local-WWW: $(HTML_FILES) copy-to-top
# we want footers even if website builds (or is built) partly
$(MAKE) footify
endif
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
+local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+ rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+
+info-dir:
$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
$(MAKE) footify
$(MAKE) deep-footify
-# $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
-# $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
-# | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-
-
$(outdir)/%.bib: %.bib
ln -f $< $@
rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
-backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
- $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
-
# when cross-compiling, we don't have lilypond
ifneq ($(CROSS),yes)
$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
# 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 out
-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)
-
-# 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.
+web-doc:
+ $(MAKE) out=www -C Documentation WWW
+ $(MAKE) footify
- $(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=0: Hack for compiling without kpathsea -- not recommended
+my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
-# 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)
$(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:
+ $(MAKE) out=www -C input WWW
+ $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
+
+
+long-examples:
+ $(MAKE) out=www -C mutopia WWW
+ $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
+
+lily: lily/$(outdir)/lilypond
+
+lily/$(outdir)/lilypond:
+ $(MAKE) -C lily
+
+local-web: fonts lily $(TOP_HTMLS:%.html=%) footify 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 'out-www' | 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)
$(SHELL) $(buildscript-dir)/clean-fonts.sh
+
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=140
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=jcn5
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
OUTCONF_FILES = $(OUTIN_FILES)
OUT_DIST_FILES = $(OUTIN_FILES)
-STEPMAKE_TEMPLATES = yolily-debian
+STEPMAKE_TEMPLATES = debian
include $(depth)/make/stepmake.make
{0, "version", 'v', _i ("print version number")},
{0, "verbose", 'V', _i ("verbose")},
{0, "warranty", 'w', _i ("show warranty and copyright")},
- {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
+ {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
{0,0,0,0}
};
export TFMFONTS=$(topdir)/mf/out:
export LILYPONDPREFIX:=$(depth)/
+export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)
+# guile load path?
the-script-dir=$(wildcard $(script-dir))
+include $(stepdir)/www-targets.make
+
+
.PHONY: download mutopia png ps scores tar
.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
+
all: $(OUT_FILES)
local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
-local-web:
- $(MAKE) conf=www local-WWW
-
convert-ly: local-convert-ly
$(LOOP)
scores: $(score_ps)
$(MAKE) ps_examples="$<" ps
-#
-# <NAME> and -book targets only available through ly.make template makefile;
-# too scary to install in LilyPonds make yet.
-#
-#
-
-ifeq (0,1)
-#
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
- psbook $< $<.1
- pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.1 $@
- rm -f $<.1
-
-#
-# Catch-all target: type `make foo' to make out/foo.ps,
-# or make `foo-book' to make out/foo-book.ps
-#
-%: $(outdir)/%.ps
- @echo Making $@ from $<
-endif
-
local-mutopia:
$(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
LYM4_FILES = $(wildcard *.lym4)
EXTRA_DIST_FILES += $(FLY_FILES) $(SLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES)
-# WWW.make
-
ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples)))
sly_examples=$(addprefix $(outdir)/, $(addsuffix .sly.txt, $(slexamples)))
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-16 09:44+0100\n"
+"POT-Creation-Date: 2001-03-20 23:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ly2dvi.py:74 main.cc:95 main.cc:109
+#: ly2dvi.py:86 main.cc:95 main.cc:105
msgid "this help"
msgstr ""
-#: ly2dvi.py:75
+#: ly2dvi.py:87
msgid "change global setting KEY to VAL"
msgstr ""
-#: ly2dvi.py:76
+#: ly2dvi.py:88
msgid "generate PostScript output"
msgstr ""
-#: ly2dvi.py:77
+#: ly2dvi.py:89
msgid "keep all output, and name the directory ly2dvi.dir"
msgstr ""
-#: ly2dvi.py:78
+#: ly2dvi.py:90
msgid "don't run LilyPond"
msgstr ""
-#: ly2dvi.py:79 main.cc:104 main.cc:119
+#: ly2dvi.py:91 main.cc:115
+msgid "verbose"
+msgstr ""
+
+#: ly2dvi.py:92 main.cc:104 main.cc:114
msgid "print version number"
msgstr ""
-#: ly2dvi.py:80 main.cc:106 main.cc:121
+#: ly2dvi.py:93 main.cc:106 main.cc:116
msgid "show warranty and copyright"
msgstr ""
-#: ly2dvi.py:81
+#: ly2dvi.py:94
msgid "dump all final output into DIR"
msgstr ""
-#: ly2dvi.py:82 main.cc:113
+#: ly2dvi.py:95 main.cc:109
msgid "write Makefile dependencies for every input file"
msgstr ""
-#: data-file.cc:118 input.cc:85 ly2dvi.py:108 midi-parser.cc:100 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23
msgid "warning: "
msgstr ""
-#: input.cc:90 ly2dvi.py:113 ly2dvi.py:247 warn.cc:9 warn.cc:17
+#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17
msgid "error: "
msgstr ""
-#: ly2dvi.py:115
+#: ly2dvi.py:130
msgid "Exiting ... "
msgstr ""
-#: ly2dvi.py:134
+#: ly2dvi.py:149
#, c-format
-msgid "Reading `%s'"
+msgid "Reading %s..."
msgstr ""
-#: ly2dvi.py:138 mapped-file-storage.cc:87 mudela-stream.cc:111
+#: ly2dvi.py:153 mapped-file-storage.cc:87 mudela-stream.cc:111
#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
#, c-format
msgid "can't open file: `%s'"
msgstr ""
-#: ly2dvi.py:201
+#: ly2dvi.py:216
#, c-format
msgid "Usage: %s [OPTION]... FILE"
msgstr ""
-#: ly2dvi.py:203
+#: ly2dvi.py:218
msgid "Generate .dvi with LaTeX for LilyPond"
msgstr ""
-#: ly2dvi.py:205 main.cc:119 main.cc:151
+#: ly2dvi.py:220 main.cc:119 main.cc:146
msgid "Options:"
msgstr ""
-#: ly2dvi.py:209
+#: ly2dvi.py:224
msgid "all output is written in the CURRENT directory"
msgstr ""
-#: ly2dvi.py:211 main.cc:123 main.cc:174
+#: ly2dvi.py:226 main.cc:123 main.cc:169
#, c-format
msgid "Report bugs to %s"
msgstr ""
-#: ly2dvi.py:243
+#: ly2dvi.py:260
#, c-format
msgid "Invoking `%s'"
msgstr ""
-#: ly2dvi.py:247
+#: ly2dvi.py:263
#, c-format
msgid "command exited with value %d"
msgstr ""
-#: ly2dvi.py:249
+#: ly2dvi.py:265
msgid "(ignored)"
msgstr ""
-#: ly2dvi.py:278
-#, c-format
-msgid "invalid value: %s"
-msgstr ""
-
-#: ly2dvi.py:284
+#: ly2dvi.py:301
#, c-format
msgid "no such setting: %s"
msgstr ""
-#: ly2dvi.py:292
+#: ly2dvi.py:309
#, c-format
msgid "Analyzing `%s'"
msgstr ""
-#: ly2dvi.py:336
+#: ly2dvi.py:353
#, c-format
msgid "no lilypond output found for %s"
msgstr ""
-#: ly2dvi.py:568 scores.cc:44
+#: ly2dvi.py:395
+#, c-format
+msgid "invalid value: %s"
+msgstr ""
+
+#: ly2dvi.py:602 scores.cc:44
#, c-format
msgid "dependencies output to %s..."
msgstr ""
-#: ly2dvi.py:569
+#: ly2dvi.py:603
#, c-format
-msgid "%s file left in `%s'"
+msgid "%s output to %s..."
msgstr ""
#: data-file.cc:54
msgid "can't find default font: `%s'"
msgstr ""
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
+#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137
#, c-format
msgid "(search path: `%s')"
msgstr ""
-#: all-font-metrics.cc:173 parser.yy:1663
+#: all-font-metrics.cc:173 parser.yy:1681
msgid "Giving up"
msgstr ""
msgid "already have a decrescendo"
msgstr ""
-#: dynamic-engraver.cc:315
+#: dynamic-engraver.cc:318
msgid "unterminated (de)crescendo"
msgstr ""
msgid "no one to print a repeat brace"
msgstr ""
-#: font-interface.cc:220
+#: font-interface.cc:237
msgid "couldn't find any font satisfying "
msgstr ""
msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request."
msgstr ""
-#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
+#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24
#: scores.cc:136 scores.cc:142
#, c-format
msgid "can't find file: `%s'"
msgid "Huh? Melismatic note found to have associated lyrics."
msgstr ""
-#: main.cc:108
+#: main.cc:104
msgid "EXT"
msgstr ""
-#: main.cc:108
+#: main.cc:104
msgid "use output format EXT (scm, ps, tex or as)"
msgstr ""
-#: main.cc:110
+#: main.cc:106
msgid "FIELD"
msgstr ""
-#: main.cc:110
+#: main.cc:106
msgid "write header field to BASENAME.FIELD"
msgstr ""
-#: main.cc:111 main.cc:114
+#: main.cc:107 main.cc:110
msgid "DIR"
msgstr ""
-#: main.cc:111
+#: main.cc:107
msgid "add DIR to search path"
msgstr ""
-#: main.cc:98 main.cc:112
+#: main.cc:98 main.cc:108
msgid "FILE"
msgstr ""
-#: main.cc:112
+#: main.cc:108
msgid "use FILE as init file"
msgstr ""
-#: main.cc:114
+#: main.cc:110
msgid "prepend DIR to dependencies"
msgstr ""
-#: main.cc:115
+#: main.cc:111
msgid "produce MIDI output only"
msgstr ""
-#: main.cc:116
+#: main.cc:112
msgid "NAME"
msgstr ""
-#: main.cc:116
+#: main.cc:112
msgid "write output to NAME"
msgstr ""
-#: main.cc:117
+#: main.cc:113
msgid "inhibit file output naming and exporting"
msgstr ""
-#: main.cc:103 main.cc:118
-msgid "don't timestamp the output"
-msgstr ""
-
-#: main.cc:120
-msgid "verbose"
+#: main.cc:117
+msgid "EXPR"
msgstr ""
-#: main.cc:122
-msgid "write midi ouput in formatted ascii"
+#: main.cc:117
+msgid "evalute EXPR as Scheme after .scm init is read"
msgstr ""
#.
#. No version number or newline here. It confuses help2man
#.
-#: main.cc:139
+#: main.cc:134
#, c-format
msgid "Usage: %s [OPTION]... [FILE]..."
msgstr ""
-#: main.cc:141
+#: main.cc:136
msgid "Typeset music and or play MIDI from FILE"
msgstr ""
-#: main.cc:145
+#: main.cc:140
msgid ""
"LilyPond is a music typesetter. It produces beautiful sheet music\n"
"using a high level description file as input. LilyPond is part of \n"
"the GNU Project.\n"
msgstr ""
-#: main.cc:155
+#: main.cc:150
msgid "This binary was compiled with the following options:"
msgstr ""
-#: main.cc:55 main.cc:182
+#: main.cc:55 main.cc:177
#, c-format
msgid ""
"This is free software. It is covered by the GNU General Public License,\n"
"certain conditions. Invoke as `%s --warranty' for more information.\n"
msgstr ""
-#: main.cc:62 main.cc:189 main.cc:201
+#: main.cc:62 main.cc:184 main.cc:196
#, c-format
msgid "Copyright (c) %s by"
msgstr ""
-#: main.cc:199
+#: main.cc:194
msgid "GNU LilyPond -- The music typesetter"
msgstr ""
-#: main.cc:71 main.cc:207
+#: main.cc:71 main.cc:202
msgid ""
" This program is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public License version 2\n"
msgid "Transposition by %s makes accidental larger than two"
msgstr ""
-#: music.cc:226
+#: music.cc:224
msgid "ly_get_mus_property (): Not a Music"
msgstr ""
-#: music.cc:240
+#: music.cc:238
msgid "ly_set_mus_property (): Not a symbol"
msgstr ""
-#: music.cc:252
+#: music.cc:250
msgid "ly_set_mus_property (): not of type Music"
msgstr ""
-#: music.cc:266
+#: music.cc:264
msgid "ly_make_music (): Not a string"
msgstr ""
+#: music.cc:284
+msgid "ly_music_name (): Not a music expression"
+msgstr ""
+
#: music-output-def.cc:115
#, c-format
msgid "can't find `%s' context"
msgstr ""
-#: my-lily-lexer.cc:137
+#: my-lily-lexer.cc:138
#, c-format
msgid "Identifier name is a keyword: `%s'"
msgstr ""
-#: my-lily-lexer.cc:157
+#: my-lily-lexer.cc:158
#, c-format
msgid "error at EOF: %s"
msgstr ""
msgid "paper output to %s..."
msgstr ""
-#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102
+#: mudela-stream.cc:93 paper-outputter.cc:85 performance.cc:95
msgid ", at "
msgstr ""
-#: paper-outputter.cc:245
+#: paper-outputter.cc:232
#, c-format
msgid "writing header field %s to %s..."
msgstr ""
msgid "Creator: "
msgstr ""
-#: performance.cc:116
+#: performance.cc:109
#, c-format
msgid "from musical definition: %s"
msgstr ""
-#: performance.cc:171
+#: performance.cc:164
#, c-format
msgid "MIDI output to %s..."
msgstr ""
#. How to shut up this warning, when no notes appeared because
#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:213 tie-performer.cc:173
+#: tie-engraver.cc:215 tie-performer.cc:173
msgid "No ties were created!"
msgstr ""
-#: tie-engraver.cc:232
+#: tie-engraver.cc:234
msgid "lonely tie"
msgstr ""
msgid "unknown translator: `%s'"
msgstr ""
-#: translator-def.cc:96
+#: translator-def.cc:99
msgid "Program has no such type"
msgstr ""
-#: translator-def.cc:102
+#: translator-def.cc:105
#, c-format
msgid "Already contains: `%s'"
msgstr ""
-#: translator-def.cc:103
+#: translator-def.cc:106
#, c-format
msgid "Not adding translator: `%s'"
msgstr ""
-#: translator-def.cc:215
+#: translator-def.cc:224
#, c-format
msgid "can't find: `%s'"
msgstr ""
msgid "can't find or create: `%s'"
msgstr ""
-#: translator-group.cc:403
+#: translator-group.cc:414
#, c-format
msgid ""
"Can't find property type-check for `%s'. Perhaps you made a typing error?"
msgstr ""
-#: translator-group.cc:417
+#: translator-group.cc:428
#, c-format
msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
msgstr ""
#. programming_error?
-#: translator-group.cc:436
+#: translator-group.cc:447
msgid "ly-get-trans-property: expecting a Translator_group argument"
msgstr ""
msgid "Oldest supported input version: %s"
msgstr ""
-#: parser.yy:472
+#: parser.yy:473
msgid "Wrong type for property value"
msgstr ""
-#: parser.yy:667
+#: parser.yy:672
msgid "More alternatives than repeats. Junking excess alternatives."
msgstr ""
-#: parser.yy:731
+#: parser.yy:736
msgid "Second argument must be a symbol"
msgstr ""
-#: parser.yy:736
+#: parser.yy:741
msgid "First argument must be a procedure taking 1 argument"
msgstr ""
-#: parser.yy:1212
+#: parser.yy:1236
msgid "Expecting string as script definition"
msgstr ""
-#: parser.yy:1222
+#: parser.yy:1246
msgid "Can't specify direction for this request"
msgstr ""
-#: parser.yy:1353
+#: parser.yy:1371
msgid "Expecting musical-pitch value"
msgstr ""
-#: parser.yy:1364
+#: parser.yy:1382
msgid "Must have duration object"
msgstr ""
-#: parser.yy:1373 parser.yy:1381 parser.yy:1661
+#: parser.yy:1391 parser.yy:1399 parser.yy:1679
msgid "Have to be in Lyric mode for lyrics"
msgstr ""
-#: parser.yy:1546 parser.yy:1575
+#: parser.yy:1564 parser.yy:1593
#, c-format
msgid "not a duration: %d"
msgstr ""
-#: parser.yy:1584
+#: parser.yy:1602
msgid "Have to be in Note mode for notes"
msgstr ""
-#: parser.yy:1680
+#: parser.yy:1698
msgid "Have to be in Chord mode for chords"
msgstr ""
-#: parser.yy:1842 parser.yy:1860
+#: parser.yy:1860 parser.yy:1878
msgid "need integer number arg"
msgstr ""
-#: parser.yy:1846
+#: parser.yy:1864
msgid "Must be positive integer"
msgstr ""
msgid "set smallest duration"
msgstr ""
+#: main.cc:103
+msgid "don't timestamp the output"
+msgstr ""
+
#: main.cc:105
msgid "be verbose"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: lilypond 1.3.59\n"
-"POT-Creation-Date: 2001-03-16 09:44+0100\n"
+"POT-Creation-Date: 2001-03-20 23:05+0100\n"
"PO-Revision-Date: 2000-06-09 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Date: 1998-05-26 11:26:28+0200\n"
"From: <janneke@gnu.org>\n"
-"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n"
+"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po "
+"--add-comments --keyword=_\n"
"Files: bow.cc int.cc\n"
-#: ly2dvi.py:74 main.cc:95 main.cc:109
+#: ly2dvi.py:86 main.cc:95 main.cc:105
msgid "this help"
msgstr "deze hulp"
-#: ly2dvi.py:75
+#: ly2dvi.py:87
msgid "change global setting KEY to VAL"
msgstr "verander globale instelling SLEUTEL in WAARDE"
-#: ly2dvi.py:76
+#: ly2dvi.py:88
msgid "generate PostScript output"
msgstr "genereer PostScipt uitvoer"
-#: ly2dvi.py:77
+#: ly2dvi.py:89
msgid "keep all output, and name the directory ly2dvi.dir"
msgstr "bewaar alle uitvoer, en noem de directory ly2dvi.dir"
-#: ly2dvi.py:78
+#: ly2dvi.py:90
msgid "don't run LilyPond"
msgstr "draai LilyPond niet"
-#: ly2dvi.py:79 main.cc:104 main.cc:119
+#: ly2dvi.py:91 main.cc:115
+msgid "verbose"
+msgstr "breedsprakig"
+
+#: ly2dvi.py:92 main.cc:104 main.cc:114
msgid "print version number"
msgstr "druk versienummer af"
-#: ly2dvi.py:80 main.cc:106 main.cc:121
+#: ly2dvi.py:93 main.cc:106 main.cc:116
msgid "show warranty and copyright"
msgstr "toon garantie en auteursrechten"
-#: ly2dvi.py:81
+#: ly2dvi.py:94
msgid "dump all final output into DIR"
msgstr "dump alle uiteindelijke uivoer in DIR"
-#: ly2dvi.py:82 main.cc:113
+#: ly2dvi.py:95 main.cc:109
msgid "write Makefile dependencies for every input file"
msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand"
-#: data-file.cc:118 input.cc:85 ly2dvi.py:108 midi-parser.cc:100 warn.cc:23
+#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23
msgid "warning: "
msgstr "waarschuwing: "
-#: input.cc:90 ly2dvi.py:113 ly2dvi.py:247 warn.cc:9 warn.cc:17
+#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17
msgid "error: "
msgstr "fout: "
-#: ly2dvi.py:115
+#: ly2dvi.py:130
msgid "Exiting ... "
msgstr "Beëidigen ..."
-#: ly2dvi.py:134
+#: ly2dvi.py:149
#, c-format
-msgid "Reading `%s'"
-msgstr "Inlezen `%s'"
+msgid "Reading %s..."
+msgstr "Inlezen %s..."
-#: ly2dvi.py:138 mapped-file-storage.cc:87 mudela-stream.cc:111
+#: ly2dvi.py:153 mapped-file-storage.cc:87 mudela-stream.cc:111
#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
#, c-format
msgid "can't open file: `%s'"
msgstr "kan bestand niet openen: `%s'"
-#: ly2dvi.py:201
+#: ly2dvi.py:216
#, c-format
msgid "Usage: %s [OPTION]... FILE"
msgstr "Gebruik: %s [OPTIE]... BESTAND"
-#: ly2dvi.py:203
+#: ly2dvi.py:218
msgid "Generate .dvi with LaTeX for LilyPond"
msgstr "Genereer .dvi met LaTeX voor LilyPond"
-#: ly2dvi.py:205 main.cc:119 main.cc:151
+#: ly2dvi.py:220 main.cc:119 main.cc:146
msgid "Options:"
msgstr "Opties:"
-#: ly2dvi.py:209
+#: ly2dvi.py:224
msgid "all output is written in the CURRENT directory"
msgstr "alle uitvoer wordt naar HUIDIGE directory geschreven"
-#: ly2dvi.py:211 main.cc:123 main.cc:174
+#: ly2dvi.py:226 main.cc:123 main.cc:169
#, c-format
msgid "Report bugs to %s"
msgstr ""
"Meld luizen in het programma aan %s;\n"
"meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
-#: ly2dvi.py:243
+#: ly2dvi.py:260
#, c-format
msgid "Invoking `%s'"
msgstr "Uitvoeren `%s'"
-#: ly2dvi.py:247
+#: ly2dvi.py:263
#, c-format
msgid "command exited with value %d"
msgstr "opdracht eindigde met waarde %d"
-#: ly2dvi.py:249
+#: ly2dvi.py:265
msgid "(ignored)"
msgstr "(genegeerd)"
-#: ly2dvi.py:278
-#, c-format
-msgid "invalid value: %s"
-msgstr "ongeldige waarde: %s"
-
-#: ly2dvi.py:284
+#: ly2dvi.py:301
#, c-format
msgid "no such setting: %s"
msgstr "geen dergelijke instelling: %s"
-#: ly2dvi.py:292
+#: ly2dvi.py:309
#, c-format
msgid "Analyzing `%s'"
msgstr "Analyseren `%s'"
-#: ly2dvi.py:336
+#: ly2dvi.py:353
#, c-format
msgid "no lilypond output found for %s"
msgstr "geen lilypond uitvoer gevonden voor %s"
-#: ly2dvi.py:568 scores.cc:44
+#: ly2dvi.py:395
+#, c-format
+msgid "invalid value: %s"
+msgstr "ongeldige waarde: %s"
+
+#: ly2dvi.py:602 scores.cc:44
#, c-format
msgid "dependencies output to %s..."
msgstr "afhankelijkheden uitvoer naar %s..."
-#: ly2dvi.py:569
+#: ly2dvi.py:603
#, c-format
-msgid "%s file left in `%s'"
-msgstr "%s bestand achtergelaten in `%s'"
+msgid "%s output to %s..."
+msgstr "%s uitvoer naar %s..."
#: data-file.cc:54
msgid "EOF in a string"
msgid "can't find default font: `%s'"
msgstr "kan verstekfont niet vinden: `%s'"
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
+#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137
#, c-format
msgid "(search path: `%s')"
msgstr "(zoekpad: `%s')"
-#: all-font-metrics.cc:173 parser.yy:1663
+#: all-font-metrics.cc:173 parser.yy:1681
msgid "Giving up"
msgstr "Geef op"
msgid "already have a decrescendo"
msgstr "heb al een decrescendo"
-#: dynamic-engraver.cc:315
+#: dynamic-engraver.cc:318
msgid "unterminated (de)crescendo"
msgstr "onbeëindigd (de)crescendo"
msgid "no one to print a repeat brace"
msgstr "niemand om een herhalings haak af te drukken"
-#: font-interface.cc:220
+#: font-interface.cc:237
msgid "couldn't find any font satisfying "
msgstr "kon geen enkel font vinden dat voldoet aan "
msgstr ""
"Niets om streepje aan linkerkant aan vast te maken. Negeer streepje verzoek."
-#: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
+#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24
#: scores.cc:136 scores.cc:142
#, c-format
msgid "can't find file: `%s'"
msgid "Huh? Melismatic note found to have associated lyrics."
msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben."
-#: main.cc:108
+#: main.cc:104
msgid "EXT"
msgstr "EXT"
-#: main.cc:108
+#: main.cc:104
msgid "use output format EXT (scm, ps, tex or as)"
msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)"
-#: main.cc:110
+#: main.cc:106
msgid "FIELD"
msgstr "VELD"
-#: main.cc:110
+#: main.cc:106
msgid "write header field to BASENAME.FIELD"
msgstr "schrijf kop veld naar BASISNAAM.VELD"
-#: main.cc:111 main.cc:114
+#: main.cc:107 main.cc:110
msgid "DIR"
msgstr "DIR"
-#: main.cc:111
+#: main.cc:107
msgid "add DIR to search path"
msgstr "voeg DIR toe aan zoekpad"
-#: main.cc:98 main.cc:112
+#: main.cc:98 main.cc:108
msgid "FILE"
msgstr "BESTAND"
-#: main.cc:112
+#: main.cc:108
msgid "use FILE as init file"
msgstr "gebruik BESTAND als initialisatiebestand"
-#: main.cc:114
+#: main.cc:110
msgid "prepend DIR to dependencies"
msgstr "voeg DIR voor aan afhankelijkheden"
-#: main.cc:115
+#: main.cc:111
msgid "produce MIDI output only"
msgstr "produceer alleen MIDI uitvoer"
-#: main.cc:116
+#: main.cc:112
msgid "NAME"
msgstr "NAAM"
-#: main.cc:116
+#: main.cc:112
msgid "write output to NAME"
msgstr "schrijf uitvoer naar NAAM"
-#: main.cc:117
+#: main.cc:113
msgid "inhibit file output naming and exporting"
msgstr "verbied naamgeving van uitvoer bestand en exportering"
-#: main.cc:103 main.cc:118
-msgid "don't timestamp the output"
-msgstr "geen tijdsstempel in de uitvoer"
-
-#: main.cc:120
-msgid "verbose"
-msgstr "breedsprakig"
+#: main.cc:117
+msgid "EXPR"
+msgstr "EXPR"
-#: main.cc:122
-msgid "write midi ouput in formatted ascii"
-msgstr "schrijf midi uitvoer in geformatteerd ascii"
+#: main.cc:117
+msgid "evalute EXPR as Scheme after .scm init is read"
+msgstr "evalueer EXPR als Scheme nadat .scm init is gelezen"
#.
#. No version number or newline here. It confuses help2man
#.
-#: main.cc:139
+#: main.cc:134
#, c-format
msgid "Usage: %s [OPTION]... [FILE]..."
msgstr "Gebruik: %s [OPTIE]... [BESTAND]..."
-#: main.cc:141
+#: main.cc:136
msgid "Typeset music and or play MIDI from FILE"
msgstr "Zet muziek en of speel MIDI van BESTAND"
-#: main.cc:145
+#: main.cc:140
msgid ""
"LilyPond is a music typesetter. It produces beautiful sheet music\n"
"using a high level description file as input. LilyPond is part of \n"
"uitgaande van een hoog niveau beschrijving bestand. LilyPond \n"
"maakt deel uit van het GNU Project.\n"
-#: main.cc:155
+#: main.cc:150
msgid "This binary was compiled with the following options:"
msgstr "Dit programma is gecompileerd met de volgende instellingen:"
-#: main.cc:55 main.cc:182
+#: main.cc:55 main.cc:177
#, c-format
msgid ""
"This is free software. It is covered by the GNU General Public License,\n"
"onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n"
"informatie.\n"
-#: main.cc:62 main.cc:189 main.cc:201
+#: main.cc:62 main.cc:184 main.cc:196
#, c-format
msgid "Copyright (c) %s by"
msgstr "Copyright (c) %s "
-#: main.cc:199
+#: main.cc:194
msgid "GNU LilyPond -- The music typesetter"
msgstr "GNU LilyPond -- De Muziekzetter"
-#: main.cc:71 main.cc:207
+#: main.cc:71 main.cc:202
msgid ""
" This program is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public License version 2\n"
msgid "Transposition by %s makes accidental larger than two"
msgstr "Transponering van %s geeft tripel kruizen/mollen"
-#: music.cc:226
+#: music.cc:224
msgid "ly_get_mus_property (): Not a Music"
msgstr "ly_get_mus_property (): Geen Muziek"
-#: music.cc:240
+#: music.cc:238
msgid "ly_set_mus_property (): Not a symbol"
msgstr "ly_set_mus_property (): Geen symbool"
-#: music.cc:252
+#: music.cc:250
msgid "ly_set_mus_property (): not of type Music"
msgstr "ly_set_mus_property (): niet van type Muziek"
-#: music.cc:266
+#: music.cc:264
msgid "ly_make_music (): Not a string"
msgstr "ly_make_music (): Geen string"
+#: music.cc:284
+msgid "ly_music_name (): Not a music expression"
+msgstr "ly_make_music (): Geen muziek expressie"
+
#: music-output-def.cc:115
#, c-format
msgid "can't find `%s' context"
msgstr "kan `%s' context niet vinden"
-#: my-lily-lexer.cc:137
+#: my-lily-lexer.cc:138
#, c-format
msgid "Identifier name is a keyword: `%s'"
msgstr "Identifier naam is een sleutelwoord: `%s'"
-#: my-lily-lexer.cc:157
+#: my-lily-lexer.cc:158
#, c-format
msgid "error at EOF: %s"
msgstr "fout bij EOF: %s"
msgid "paper output to %s..."
msgstr "papier uitvoer naar %s..."
-#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102
+#: mudela-stream.cc:93 paper-outputter.cc:85 performance.cc:95
msgid ", at "
msgstr ", bij "
-#: paper-outputter.cc:245
+#: paper-outputter.cc:232
#, c-format
msgid "writing header field %s to %s..."
msgstr "Schijven van kop veld %s naar bestand %s..."
msgid "Creator: "
msgstr "Schepper: "
-#: performance.cc:116
+#: performance.cc:109
#, c-format
msgid "from musical definition: %s"
msgstr "van muzikale definitie: %s"
-#: performance.cc:171
+#: performance.cc:164
#, c-format
msgid "MIDI output to %s..."
msgstr "MIDI uitvoer naar %s..."
#. How to shut up this warning, when no notes appeared because
#. they were suicided by Thread_devnull_engraver?
-#: tie-engraver.cc:213 tie-performer.cc:173
+#: tie-engraver.cc:215 tie-performer.cc:173
msgid "No ties were created!"
msgstr "Geen overbindingen geschapen!"
-#: tie-engraver.cc:232
+#: tie-engraver.cc:234
msgid "lonely tie"
msgstr "eenzame overbinding"
msgid "unknown translator: `%s'"
msgstr "onbekende translator: `%s'"
-#: translator-def.cc:96
+#: translator-def.cc:99
msgid "Program has no such type"
msgstr "Programma heeft geen dergelijk type"
-#: translator-def.cc:102
+#: translator-def.cc:105
#, c-format
msgid "Already contains: `%s'"
msgstr "Bevat reeds: `%s'"
-#: translator-def.cc:103
+#: translator-def.cc:106
#, c-format
msgid "Not adding translator: `%s'"
msgstr "Voeg translator niet toe: `%s'"
-#: translator-def.cc:215
+#: translator-def.cc:224
#, c-format
msgid "can't find: `%s'"
msgstr "kan niet vinden: `%s'"
msgid "can't find or create: `%s'"
msgstr "kan niet vinden of scheppen: `%s'"
-#: translator-group.cc:403
+#: translator-group.cc:414
#, c-format
msgid ""
"Can't find property type-check for `%s'. Perhaps you made a typing error?"
msgstr ""
"Kan geen type-controle vinden voor property `%s'. Misschien een tikfout?"
-#: translator-group.cc:417
+#: translator-group.cc:428
#, c-format
msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'"
#. programming_error?
-#: translator-group.cc:436
+#: translator-group.cc:447
msgid "ly-get-trans-property: expecting a Translator_group argument"
msgstr "ly-get-trans-property: verwacht een Translator_group argument"
msgid "Oldest supported input version: %s"
msgstr "Oudst ondersteunde invoerversie: %s"
-#: parser.yy:472
+#: parser.yy:473
msgid "Wrong type for property value"
msgstr "Verkeerd type voor property waarde"
-#: parser.yy:667
+#: parser.yy:672
msgid "More alternatives than repeats. Junking excess alternatives."
msgstr ""
"Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven."
-#: parser.yy:731
+#: parser.yy:736
msgid "Second argument must be a symbol"
msgstr "Tweede argument moet een symbool zijn"
-#: parser.yy:736
+#: parser.yy:741
msgid "First argument must be a procedure taking 1 argument"
msgstr "Eerste argument moet een procedure zijn met 1 argument"
-#: parser.yy:1212
+#: parser.yy:1236
msgid "Expecting string as script definition"
msgstr "Verwacht string voor script definitie"
-#: parser.yy:1222
+#: parser.yy:1246
msgid "Can't specify direction for this request"
msgstr "Kan richting voor dit verzoek niet specificeren"
-#: parser.yy:1353
+#: parser.yy:1371
msgid "Expecting musical-pitch value"
msgstr "Verwacht musical-pitch waarde"
-#: parser.yy:1364
+#: parser.yy:1382
msgid "Must have duration object"
msgstr "Moet duur object hebben"
-#: parser.yy:1373 parser.yy:1381 parser.yy:1661
+#: parser.yy:1391 parser.yy:1399 parser.yy:1679
msgid "Have to be in Lyric mode for lyrics"
msgstr "Moet in Lyric modus zijn voor liedteksten"
-#: parser.yy:1546 parser.yy:1575
+#: parser.yy:1564 parser.yy:1593
#, c-format
msgid "not a duration: %d"
msgstr "geen duur: %d"
-#: parser.yy:1584
+#: parser.yy:1602
msgid "Have to be in Note mode for notes"
msgstr "Moet in Note modus zijn voor noten"
-#: parser.yy:1680
+#: parser.yy:1698
msgid "Have to be in Chord mode for chords"
msgstr "Moet in Chord modus zijn voor accoorden"
-#: parser.yy:1842 parser.yy:1860
+#: parser.yy:1860 parser.yy:1878
msgid "need integer number arg"
msgstr "heb integer getal arg nogig"
-#: parser.yy:1846
+#: parser.yy:1864
msgid "Must be positive integer"
msgstr "Moet positieve integer zijn"
msgid "set smallest duration"
msgstr "zet kortste duur"
+#: main.cc:103
+msgid "don't timestamp the output"
+msgstr "geen tijdsstempel in de uitvoer"
+
#: main.cc:105
msgid "be verbose"
msgstr "wees breedsprakig"
# generate ps ?
postscript_p = 0
+# be verbose?
+verbose_p = 0
+
option_definitions = [
('', 'h', 'help', _ ("this help")),
('KEY=VAL', 's', 'set', _ ("change global setting KEY to VAL")),
('', 'P', 'postscript', _ ("generate PostScript output")),
('', 'k', 'keep', _ ("keep all output, and name the directory ly2dvi.dir")),
('', '', 'no-lily', _ ("don't run LilyPond")),
+ ('', 'V', 'verbose', _ ("verbose")),
('', 'v', 'version', _ ("print version number")),
('', 'w', 'warranty', _ ("show warranty and copyright")),
('DIR', '', 'outdir', _ ("dump all final output into DIR")),
+def star_progress (s):
+ '''Progress messages that stand out between lilypond stuff'''
+ progress ('*** ' + s)
+
def progress (s):
- '''Make the progress messages stand out between lilypond stuff'''
- # Why should they have to stand out? Blend in would be nice too.
- sys.stderr.write ('*** ' + s+ '\n')
+ sys.stderr.write (s + '\n')
def warning (s):
sys.stderr.write (_ ("warning: ") + s)
except IOError:
pass
if f:
- sys.stderr.write (_ ("Reading `%s'") % nm)
+ sys.stderr.write (_ ("Reading %s...") % nm)
sys.stderr.write ('\n');
return (f.read (), nm)
else:
os.environ['TFMFONTS'] = original_dir + fp
os.chdir (temp_dir)
- progress (_ ('Temp directory is `%s\'\n') % temp_dir)
+ if verbose_p:
+ progress (_ ('Temp directory is `%s\'\n') % temp_dir)
def system (cmd, ignore_error = 0):
- sys.stderr.write (_ ("Invoking `%s\'") % cmd)
- sys.stderr.write ('\n')
+ if verbose_p:
+ progress (_ ("Invoking `%s\'") % cmd)
st = os.system (cmd)
if st:
msg = ( _ ("error: ") + _ ("command exited with value %d") % st)
def cleanup_temp ():
if not keep_temp_dir:
- progress (_ ('Cleaning up `%s\'') % temp_dir)
+ if verbose_p:
+ progress (_ ('Cleaning up `%s\'') % temp_dir)
system ('rm -rf %s' % temp_dir)
set_setting (extra_init, ss[0], ss[1])
elif o == '--dependencies' or o == '-d':
track_dependencies_p = 1
+ elif o == '--verbose' or o == '-V':
+ verbose_p = 1
elif o == '--version' or o == '-v':
identify ()
sys.exit (0)
if outdir != '.':
system ('mkdir -p %s' % outdir)
system ('cp \"%s\" \"%s\"' % (srcname, dest ))
- system ('cp *.midi %s' % outdir, ignore_error = 1)
+ if re.match ('[.]midi', string.join (os.listdir ('.'))):
+ system ('cp *.midi %s' % outdir, ignore_error = 1)
depfile = os.path.join (outdir, base + '.dep')
# most insteresting info last
progress (_ ("dependencies output to %s...") % depfile)
- progress (_ ("%s file left in `%s'") % (type, dest))
+ progress (_ ("%s output to %s...") % (type, dest))
# title package specific targets
-.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-www-doc check-rpm-icons
+.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-web-doc check-rpm-icons
-check-html-deps:
- $(MAKE) -C $(depth)/Documentation html
+#check-html-deps:
+# $(MAKE) -C $(depth)/Documentation html
-check-www-doc:
- $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
- $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
+#check-web-doc:
+# $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
+# $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
# check-rpm-doc-deps:
# $(MAKE) -C $(depth)/Documentation gifs
-check-rpm-icons:
+#check-rpm-icons:
-check-make-deps:
- $(MAKE) -C $(depth)/make
+#check-make-deps:
+# $(MAKE) -C $(depth)/make
--- /dev/null
+$(outdir)/%: %
+ rm -f $@
+ ln $< $@
+
+$(outdir)/%: $(doc-dir)/%.in
+ rm -f $@
+ cat $< | sed 's%^% %' > $@
--- /dev/null
+
+default: $(OUTCONF_FILES)
+
+$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS))
+
+
+# local-dist: default
default:
+include $(stepdir)/www-targets.make
local-WWW: $(OUTHTML_FILES) footify
-local-web:
- $(MAKE) out=www local-WWW
-
footify:
$(footify) $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html))
@echo -e "\
all update everything\n\
clean remove all genated stuff in $(outdir)\n\
- config rerun configure\n\
- deb build Debian package\n\
default same as the empty target\n\
- diff generate patch: $(depth)/$(outdir)/$(distname).diff.gz\n\
- . Options:\n\
- . from=0.1.74\n\
- . help==\n\
- . release==\n\
- . to=0.1.74.jcn2\n\
- dist roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
- distclean cleaner than clean (duh)\n\
- doc update all documentation\n\
exe update all executables\n\
help this help\n\
install install programs and data (prefix=$(prefix))\n\
lib update all libraries\n\
- release roll tarball and generate patch\n\
- rpm build Red Hat package\n\
- po make new translation Portable Object database\n\
- po-replace do po-update and replace catalogs with msgmerged versions\n\
- po-update update translation Portable Object database\n\
TAGS genarate tagfiles\n\
\n\
Make may be invoked from any subdirectory\n\
local-help:
-doc: local-doc
- $(LOOP)
-
-local-doc:
-
local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
mkdir -p $(distdir)/$(localdir)
$(LN) $(DIST_FILES) $(distdir)/$(localdir)
$(foreach i, $(EXTRA_DOC_FILES),\
cp -r $(i) $(prefix)/doc/$(package) &&) true
-WWW: local-WWW
- $(LOOP)
-
-local-WWW:
-
include $(stepdir)/package.make
include $(outdir)/dummy.dep $(DEP_FILES)
# ugh. ugh ugh ugh
$(depth)/$(configuration).make: $(depth)/configure
- @echo "**************************************"
+ @echo "************************************************************"
@echo "configure changed! You should probably reconfigure manually."
- @echo "**************************************"
+ @echo "************************************************************"
(cd $(depth); ./config.status)
touch $@ # do something for multiple simultaneous configs.
-# -*-Makefile-*-
-# title Toplevel_rules.make
-
-# empty
-
+#empty
# -*-Makefile-*-
# title Toplevel_targets.make
+include $(stepdir)/www-targets.make
+
local-dist: configure
# urg!: this gets into every package (ie: yodl)
$(MAKE) INFILE=$< OUTFILE=$@ LINECOMMENT=dnl -f $(stepdir)/automatically-generated.sub.make
endif
-local-WWW: #index.html
-index.html: check-top-web NEWS
-## $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
+$(package-icon):
+ $(MAKE) -C Documentation/pictures icon
+
+
+do-top-doc:
+ -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top
+
-WWW-clean: local-WWW-clean
- $(MAKE) out='www' clean
+$(README_TXT_FILES): do-top-doc
-local-WWW-clean:
+local-clean:
+
+###check-top-web:
+### $(MAKE) -C Documentation/topdocs WWW
+#####
+
+####index.html: check-top-web NEWS
+
+local-dist: do-top-doc
dist:
rm -rf $(distdir)
-ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
rm -rf $(distdir)/
+#
+#
local-help:
-
+ @echo -e "\
+ config rerun configure\n\
+ deb build Debian package\n\
+ diff generate patch: $(depth)/$(outdir)/$(distname).diff.gz\n\
+ . Options:\n\
+ . from=0.1.74\n\
+ . help==\n\
+ . release==\n\
+ . to=0.1.74.jcn2\n\
+ dist roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
+ distclean cleaner than clean (duh)\n\
+ doc update all documentation\n\
+ release roll tarball and generate patch\n\
+ rpm build Red Hat package\n\
+ po make new translation Portable Object database\n\
+ po-replace do po-update and replace catalogs with msgmerged versions\n\
+ po-update update translation Portable Object database\n\
+ web update website in out-www\n\
+ web-clean clean out-www\n\
+\n\
+Some of these top level targets (diff, dist, release) can be issued\n\
+from anywhere in the source tree.\n\
+"\
+#
-# -*-Makefile-*-
-# title Toplevel_vars.make
# override Generic_vars.make:
-# do not dist ./Makefile (is copied from make/Toplevel.make)
-#
DIST_FILES := $(EXTRA_DIST_FILES)
-#
+
+TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
+
+# urg?
+include $(stepdir)/documentation-vars.make
--- /dev/null
+#empty
\ No newline at end of file
--- /dev/null
+
+local-WWW:
+
+ifneq ($(strip $(depth)),.)
+WWW: local-WWW
+ $(LOOP)
+
+WWW-clean: local-WWW-clean
+ $(LOOP)
+endif
+
+local-web:
+ $(MAKE) out=www local-WWW
+
+web:
+ $(MAKE) out=www WWW
+
+local-WWW-clean:
+ rm -f $(outdir)/*
+
+local-web-clean:
+ $(MAKE) out=www local-WWW-clean
+
+web-clean:
+ $(MAKE) out=www WWW-clean
+
+
--- /dev/null
+#empty
\ No newline at end of file
-# Yolily_Debian_rules.make
-
-#empty
-# Yolily_Debian_targets.make
-
-default: $(OUTCONF_FILES)
-
-$(outdir)/%: %
- rm -f $@
- ln $< $@
-
-$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS))
-
-$(outdir)/%: $(doc-dir)/%.in
- rm -f $@
- cat $< | sed 's%^% %' > $@
-
-localdist: default
-# Yolily_Debian_vars.make
-
-#empty
-
-# Yolily_topdoc_rules.make
-
-# empty
-
-# Yolily_topdoc_targets.make
-
-default: local-doc
-
-# urg
-$(outdir)/%.html: %.yo
- $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@.in $<
- $(sed-version) < $@.in > $@
- rm -f $@.in
-
-local-WWW: copy-to-top
-
-copy-to-top: $(TO_TOP_FILES)
- $(foreach i, $(TO_TOP_FILES), \
- cp $(i) $(depth)/ && ) true
- -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website
-# Yolily_topdoc_vars.make
-
-TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
-
-# -*-Makefile-*-
-# title Yolily_Toplevel_rules.make
-
-# empty
-# -*-Makefile-*-
-# title Yolily_Toplevel_targets.make
-
-local-dist: do-top-doc
-
-$(package-icon):
- $(MAKE) -C Documentation/pictures icon
-
-do-top-doc:
- -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top
-
-$(README_TXT_FILES): do-top-doc
-
-local-clean:
-
-
-# if you fix this, please fix yodl too!
-check-top-web:
- $(MAKE) -C Documentation/topdocs WWW
-
-# -*-Makefile-*-
-# title Yolily_Toplevel_vars.make
-
-include $(stepdir)/documentation-vars.make
-
projects / lilypond.git / commitdiff