* make/lilypond-vars.make: remove stepmake compat glue.

* make/generic-vars.make: remove cruft.

1 files changed, 53 insertions, 53 deletions

diff --git a/po/es.po b/po/es.po
index 5db24ab4e3..71275fd21d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -39,7 +39,7 @@ msgstr ""
 msgid "lilylib module"
 msgstr ""
 
-#: lilylib.py:63 lilypond-book.py:131 ly2dvi.py:128 midi2ly.py:100
+#: lilylib.py:63 lilypond-book.py:131 lilypond.py:128 midi2ly.py:100
 #: mup2ly.py:75 main.cc:111
 msgid "print this help"
 msgstr "esta ayuda"
@@ -110,7 +110,7 @@ msgstr "Limpiando `%s'..."
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilylib.py:242 lilylib.py:289 lilypond-book.py:231 ly2dvi.py:512
+#: lilylib.py:242 lilylib.py:289 lilypond-book.py:231 lilypond.py:512
 msgid "The error log is as follows:"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgstr ""
 msgid "deprecated, use --force-music-fontsize"
 msgstr ""
 
-#: lilypond-book.py:132 ly2dvi.py:130 main.cc:113 main.cc:118
+#: lilypond-book.py:132 lilypond.py:130 main.cc:113 main.cc:118
 msgid "DIR"
 msgstr "DIR"
 
@@ -501,7 +501,7 @@ msgstr ""
 msgid "strip all lilypond blocks from output"
 msgstr ""
 
-#: lilypond-book.py:138 lilypond-book.py:139 ly2dvi.py:135 ly2dvi.py:136
+#: lilypond-book.py:138 lilypond-book.py:139 lilypond.py:135 lilypond.py:136
 #: midi2ly.py:102 main.cc:114 main.cc:117
 msgid "FILE"
 msgstr "FICHERO"
@@ -514,15 +514,15 @@ msgstr ""
 msgid "where to place generated files"
 msgstr ""
 
-#: lilypond-book.py:140 ly2dvi.py:137
+#: lilypond-book.py:140 lilypond.py:137
 msgid "RES"
 msgstr ""
 
-#: lilypond-book.py:141 ly2dvi.py:138
+#: lilypond-book.py:141 lilypond.py:138
 msgid "set the resolution of the preview to RES"
 msgstr ""
 
-#: lilypond-book.py:142 ly2dvi.py:148 midi2ly.py:105 mup2ly.py:78 main.cc:126
+#: lilypond-book.py:142 lilypond.py:148 midi2ly.py:105 mup2ly.py:78 main.cc:126
 msgid "be verbose"
 msgstr "ser prolijo"
 
@@ -532,7 +532,7 @@ msgstr "ser prolijo"
 msgid "print version information"
 msgstr "mostrar número de versión"
 
-#: lilypond-book.py:144 ly2dvi.py:150 midi2ly.py:107 mup2ly.py:80 main.cc:127
+#: lilypond-book.py:144 lilypond.py:150 midi2ly.py:107 mup2ly.py:80 main.cc:127
 msgid "show warranty and copyright"
 msgstr "mostrar los avisos de garantía y de copyright"
 
@@ -628,14 +628,14 @@ msgstr ""
 #. #docme: why global?
 #. Do It.
 #. should chmod -w
-#: lilypond-book.py:1557 ly2dvi.py:673 midi2ly.py:1018
+#: lilypond-book.py:1557 lilypond.py:673 midi2ly.py:1018
 #, python-format
 msgid "getopt says: `%s'"
 msgstr "getopt() dice: `%s'"
 
 #. HACK
 #. status = os.system ('lilypond -w')
-#: lilypond-book.py:1630 ly2dvi.py:777
+#: lilypond-book.py:1630 lilypond.py:777
 #, fuzzy
 msgid "no files specified on command line"
 msgstr "no se ha especificado ningún fichero en la línea de órdenes."
@@ -646,7 +646,7 @@ msgstr "no se ha especificado ningún fichero en la línea de órdenes."
 #. --hwn 20/aug/99
 #. !@PYTHON@
 #.
-#. ly2dvi.py -- Run LilyPond, add titles to bare score, generate printable
+#. lilypond.py -- Run LilyPond, add titles to bare score, generate printable
 #. document
 #. Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs
 #.
@@ -679,83 +679,83 @@ msgstr "no se ha especificado ningún fichero en la línea de órdenes."
 #. # ly2dvi: silly name?
 #. # do -P or -p by default?
 #. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: ly2dvi.py:121
+#: lilypond.py:121
 msgid "Run LilyPond, add titles, generate printable document."
 msgstr ""
 
-#: ly2dvi.py:127 main.cc:115
+#: lilypond.py:127 main.cc:115
 msgid "write Makefile dependencies for every input file"
 msgstr "crear las dependencias para Makefile de cada fichero de entrada"
 
-#: ly2dvi.py:129
+#: lilypond.py:129
 msgid "print even more output"
 msgstr ""
 
-#: ly2dvi.py:130
+#: lilypond.py:130
 msgid "add DIR to LilyPond's search path"
 msgstr "añadir DIR a la ruta de búsqueda de LilyPond"
 
-#: ly2dvi.py:132
+#: lilypond.py:132
 #, fuzzy, python-format
 msgid "keep all output, output to directory %s.dir"
 msgstr "conservar todas las salidas, y nombrar el directorio %s.dir"
 
-#: ly2dvi.py:133
+#: lilypond.py:133
 msgid "don't run LilyPond"
 msgstr "no ejecutar LilyPond"
 
-#: ly2dvi.py:134 main.cc:116
+#: lilypond.py:134 main.cc:116
 msgid "produce MIDI output only"
 msgstr "producir solamente una salida MIDI"
 
-#: ly2dvi.py:135 midi2ly.py:102
+#: lilypond.py:135 midi2ly.py:102
 msgid "write output to FILE"
 msgstr "escribir la salida en el FICHERO"
 
-#: ly2dvi.py:136
+#: lilypond.py:136
 msgid "find pfa fonts used in FILE"
 msgstr "buscar las fuentes pfa utilizadas en FICHERO"
 
-#: ly2dvi.py:139
+#: lilypond.py:139
 msgid "generate PostScript output"
 msgstr "generar una salida PostScript"
 
-#: ly2dvi.py:140
+#: lilypond.py:140
 msgid "generate PNG page images"
 msgstr ""
 
-#: ly2dvi.py:141
+#: lilypond.py:141
 #, fuzzy
 msgid "generate PS.GZ"
 msgstr "generar una salida PostScript"
 
-#: ly2dvi.py:142
+#: lilypond.py:142
 #, fuzzy
 msgid "generate PDF output"
 msgstr "generar una salida PostScript"
 
-#: ly2dvi.py:143
+#: lilypond.py:143
 msgid "use pdflatex to generate a PDF output"
 msgstr ""
 
 #. FIXME: preview, picture; to indicate creation of a PNG?
-#: ly2dvi.py:145
+#: lilypond.py:145
 msgid "make a picture of the first system"
 msgstr ""
 
-#: ly2dvi.py:146
+#: lilypond.py:146
 msgid "make HTML file with links to all output"
 msgstr ""
 
-#: ly2dvi.py:147
+#: lilypond.py:147
 msgid "KEY=VAL"
 msgstr "CLAVE=VALOR"
 
-#: ly2dvi.py:147
+#: lilypond.py:147
 msgid "change global setting KEY to VAL"
 msgstr "cambiar el parámetro global CLAVE a VALOR"
 
-#: ly2dvi.py:149 midi2ly.py:106 mup2ly.py:79 main.cc:125
+#: lilypond.py:149 midi2ly.py:106 mup2ly.py:79 main.cc:125
 msgid "print version number"
 msgstr "mostrar número de versión"
 
@@ -771,51 +771,51 @@ msgstr "mostrar número de versión"
 #. what a name.
 #. ly.warning (_ ("invalid value: %s") % `val`)
 #. ly.warning (_ ("invalid value: %s") % `val`)
-#: ly2dvi.py:232
+#: lilypond.py:232
 #, fuzzy, python-format
 msgid "no such setting: `%s'"
 msgstr "no existe tal parámetro: %s"
 
 #. 2 == user interrupt.
-#: ly2dvi.py:274
+#: lilypond.py:274
 #, python-format
 msgid "LilyPond crashed (signal %d)."
 msgstr ""
 
-#: ly2dvi.py:275
+#: lilypond.py:275
 msgid "Please submit a bug report to bug-lilypond@gnu.org"
 msgstr ""
 
-#: ly2dvi.py:281
+#: lilypond.py:281
 #, python-format
 msgid "LilyPond failed on input file %s (exit status %d)"
 msgstr ""
 
-#: ly2dvi.py:284
+#: lilypond.py:284
 #, python-format
 msgid "LilyPond failed on an input file (exit status %d)"
 msgstr ""
 
-#: ly2dvi.py:285
+#: lilypond.py:285
 #, fuzzy
 msgid "Continuing..."
 msgstr "Ejecutando %s..."
 
 #. urg
-#: ly2dvi.py:296
+#: lilypond.py:296
 #, python-format
 msgid "Analyzing %s..."
 msgstr "Analizando %s..."
 
 #. search only the first 10k
-#: ly2dvi.py:354
+#: lilypond.py:354
 #, fuzzy, python-format
 msgid "no LilyPond output found for `%s'"
 msgstr "no se ha encontrado ninguna salida de lilypond para %s"
 
 #. The final \n seems important here. It ensures that the footers and taglines end up on the right page.
 #. TODO: should set textheight (enlarge) depending on papersize.
-#: ly2dvi.py:397
+#: lilypond.py:397
 #, fuzzy, python-format
 msgid "invalid value: `%s'"
 msgstr "valor no válido: %s"
@@ -824,13 +824,13 @@ msgstr "valor no válido: %s"
 #. who the hell is 597 ?
 #. Ugh.  (La)TeX writes progress and error messages on stdout
 #. Redirect to stderr
-#: ly2dvi.py:511
+#: lilypond.py:511
 msgid "LaTeX failed on the output file."
 msgstr ""
 
 #. make a preview by rendering only the 1st line
 #. of each score
-#: ly2dvi.py:568
+#: lilypond.py:568
 msgid ""
 "Trying create PDF, but no PFA fonts found.\n"
 "Using bitmap fonts instead. This will look bad."
@@ -840,13 +840,13 @@ msgstr ""
 #. Added as functionality to ly2dvi, because ly2dvi may well need to do this
 #. in future too.
 #. no ps header?
-#: ly2dvi.py:615
+#: lilypond.py:615
 #, python-format
 msgid "not a PostScript file: `%s'"
 msgstr "no es un fichero PostScript: `%s'"
 
 #. todo
-#: ly2dvi.py:660
+#: lilypond.py:660
 #, fuzzy, python-format
 msgid "Writing HTML menu `%s'"
 msgstr "Escribiendo `%s'..."
@@ -857,18 +857,18 @@ msgstr "Escribiendo `%s'..."
 #. As a neat trick, add directory part of first input file
 #. to include path.  That way you can do without the clumsy -I in:
 #. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly
-#: ly2dvi.py:769
+#: lilypond.py:769
 msgid "pseudo filter"
 msgstr ""
 
-#: ly2dvi.py:772
+#: lilypond.py:772
 msgid "pseudo filter only for single input file"
 msgstr ""
 
 #. Ugh, maybe make a setup () function
 #. hmmm. Wish I'd 've written comments when I wrote this.
 #. now it looks complicated.
-#: ly2dvi.py:806
+#: lilypond.py:806
 #, python-format
 msgid "filename should not contain spaces: `%s'"
 msgstr "el nombre del fichero no debería contener espacios: `%s'"
@@ -884,7 +884,7 @@ msgstr "el nombre del fichero no debería contener espacios: `%s'"
 #. ## --hwn
 #. TODO: friendly message about LilyPond setup/failing?
 #.
-#: ly2dvi.py:845
+#: lilypond.py:845
 msgid "Running LilyPond failed. Rerun with --verbose for a trace."
 msgstr ""
 
@@ -893,36 +893,36 @@ msgstr ""
 #. unless: add --tex, or --latex?
 #. TODO: friendly message about TeX/LaTeX setup,
 #. trying to run tex/latex by hand
-#: ly2dvi.py:886
+#: lilypond.py:886
 msgid "Failed to make PS file. Rerun with --verbose for a trace."
 msgstr ""
 
 #. unless: add --tex, or --latex?
 #. TODO: friendly message about TeX/LaTeX setup,
 #. trying to run tex/latex by hand
-#: ly2dvi.py:916
+#: lilypond.py:916
 msgid "Running LaTeX falied. Rerun with --verbose for a trace."
 msgstr ""
 
 #. add DEP to targets?
-#: ly2dvi.py:926 input-file-results.cc:68
+#: lilypond.py:926 input-file-results.cc:68
 #, c-format, python-format
 msgid "dependencies output to `%s'..."
 msgstr "dependencias producidas en `%s'..."
 
-#: ly2dvi.py:937
+#: lilypond.py:937
 #, fuzzy, python-format
 msgid "%s output to <stdout>..."
 msgstr "%s producidos en `%s'..."
 
-#: ly2dvi.py:942 ly2dvi.py:968 includable-lexer.cc:57
+#: lilypond.py:942 lilypond.py:968 includable-lexer.cc:57
 #: input-file-results.cc:191 input-file-results.cc:197 lily-guile.cc:86
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr "no puedo encontrar el fichero: `%s'"
 
 #. Hmm, if this were a function, we could call it the except: clauses
-#: ly2dvi.py:965
+#: lilypond.py:965
 #, fuzzy, python-format
 msgid "%s output to %s..."
 msgstr "%s producidos en `%s'..."