From b826a2168c5d488197fca83ac7955a25ab5fb913 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 24 Jan 2020 09:50:36 +0100 Subject: es gibt jetzt nur noch *ein* Makefile (bis auf Konzerte) - wenn was nicht geht: altes Makefile raussuchen und das generische Makefile updaten, sodass es wieder läuft! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Abend_wird_es_wieder/Makefile | 33 ++++----------- Abend_wird_es_wieder_/Makefile | 33 ++++----------- Abendruhe/Makefile | 18 ++++---- Aennchen_von_Tharau/Makefile | 37 +++------------- Aennchen_von_Tharau_/Makefile | 37 +++------------- Alle_Jahre_wieder_/Makefile | 18 ++++---- Alle_Tage_alle_Naechte/Makefile | 18 ++++---- .../Makefile | 38 ++++------------- Alle_guten_Gaben_alles_was_wir_haben/Makefile | 38 ++++------------- Aller_Augen_warten_auf_dich_Herre/Makefile | 38 ++++------------- Als_Gott_die_Welt_erschaffen/Makefile | 33 ++++----------- Als_die_Welt_verloren/Makefile | 22 ++++------ Auf_Bethlehems_Feldern/Makefile | 38 ++++------------- Auf_meinen_lieben_Gott/Makefile | 40 ++++-------------- Aus_Gnade/Makefile | 18 ++++---- Befiehl_dem_Herren_deine_Wege/Makefile | 33 ++++----------- Bewahr_die_Erde/Makefile | 33 ++++----------- Bewahr_die_Erde_Gott/Makefile | 33 ++++----------- Bewahre_uns_Gott/Makefile | 28 ++++--------- Bleib_bei_mir_Herr/Makefile | 18 ++++---- Brich_an_du_schoenes_Morgenlicht/Makefile | 18 ++++---- Brich_mit_den_Hungrigen_dein_Brot/Makefile | 37 ++++------------ Brunnquell_aller_Gueter/Makefile | 37 ++++------------ Cantate_Domino/Makefile | 37 ++++------------ Christe_du_bist_der_helle_Tag/Makefile | 38 ++++------------- Da_beruehren_sich_Himmel_und_Erde/Makefile | 33 ++++----------- Danke_fuer_diesen_schoenen_Abend/Makefile | 38 ++++------------- Danket_dem_Herrn/Makefile | 38 ++++------------- Das_Jahr_steht_auf_der_Hoehe/Makefile | 18 ++++---- Das_grosze_Wunder_hat_ganz_klein_begonnen/Makefile | 30 ++++--------- Dein_Kreuz_Herr_Jesus/Makefile | 37 +++------------- Den_Tag_an_dem_wir_feiern_segne_Gott/Makefile | 30 ++++--------- Denn_er_hat_seinen_Engeln_/Makefile | 37 +++------------- Denn_er_hat_seinen_Engeln__/Makefile | 18 ++++---- Der_Maie_bringt_uns_der_Bluemlein_viel/Makefile | 33 ++++----------- Der_Morgenstern_ist_aufgedrungen/Makefile | 34 ++++----------- Der_Tag_ist_seiner_Hoehe_nah/Makefile | 38 ++++------------- Der_Tag_mein_Gott_ist_nun_vergangen/Makefile | 38 ++++------------- Die_Botschaft/Makefile | 33 ++++----------- Die_Himmel_erzaehlen/Makefile | 18 ++++---- Die_Himmel_ruehmen/Makefile | 37 ++++------------ Die_Nacht_ist_vorgedrungen/Makefile | 27 ++++-------- Die_Sonne_sinkt_ins_Meer/Makefile | 33 ++++----------- Die_Weihnachtsgeschichte/Makefile | 18 ++++---- Die_beste_Zeit_im_Jahr_ist_mein/Makefile | 18 ++++---- Die_beste_Zeit_im_Jahr_ist_mein_/Makefile | 18 ++++---- Drei_Koenige_wandern/Makefile | 30 ++++--------- Du_Morgenstern_du_Licht_vom_Licht/Makefile | 18 ++++---- Du_bist_der_Ehrenkoenig/Makefile | 37 +++------------- Du_bist_o_Gott_der_Herr_der_Zeit/Makefile | 18 ++++---- Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile | 37 ++++------------ Dunkel_geworden_sind_meine_Augen/Makefile | 38 ++++------------- Ehre_sei_Gott_in_der_Hoehe/Makefile | 27 ++++-------- Ein_Stern_strahlt/Makefile | 18 ++++---- Ein_Wandervolk/Makefile | 18 ++++---- Ein_feste_Burg_ist_unser_Gott/Makefile | 27 ++++-------- Er_ist_mein_Hirt/Makefile | 18 ++++---- Er_weckt_mich_alle_Morgen/Makefile | 38 ++++------------- Es_ist_ein_Ros_entsprungen/Makefile | 42 ++++--------------- Es_ist_kein_Raum_fuer_dich/Makefile | 18 ++++---- Es_kommt_ein_Schiff_geladen/Makefile | 38 ++++------------- Exsultate_Deo/Makefile | 37 ++++------------ Freu_dich_Erd_und_Sternenzelt/Makefile | 41 ++++-------------- Freude_grosze_Freude/Makefile | 18 ++++---- Freuet_euch_allezeit/Makefile | 30 ++++--------- Freuet_euch_ihr_Christen_alle/Makefile | 27 ++++-------- Freut_euch_von_Herzen/Makefile | 38 ++++------------- Friede_erfuellet_Stadt_und_Land/Makefile | 18 ++++---- Friede_mit_euch/Makefile | 18 ++++---- Froehlich_soll_mein_Herze_springen/Makefile | 33 ++++----------- Froehlich_soll_mein_Herze_springen_/Makefile | 38 ++++------------- Froehlich_soll_mein_Herze_springen__/Makefile | 40 ++++-------------- .../Makefile | 27 ++++-------- Froehlichkeit_und_leichtes_Leben/Makefile | 37 +++------------- Fuellt_die_Kruege_mit_Wasser/Makefile | 18 ++++---- Fuerchtet_euch_nicht/Makefile | 18 ++++---- Geh_aus_mein_Herz/Makefile | 18 ++++---- Geh_unter_der_Gnade/Makefile | 37 +++------------- Gib_Frieden_Herr_gib_Frieden/Makefile | 37 ++++------------ Gloria_in_D/Makefile | 26 ++++-------- Gott_der_seine_Kinder_liebt/Makefile | 37 +++------------- Gott_giebet_Speise_reichlich_und_ueberall/Makefile | 38 ++++------------- Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile | 37 +++------------- Gott_ist_treu/Makefile | 37 +++------------- Gott_soll_es_sein/Makefile | 18 ++++---- Grosz_ist_der_Herr/Makefile | 18 ++++---- Halleluja/Makefile | 18 ++++---- Halte_deine_Traeume_fest/Makefile | 30 ++++--------- Hear_my_prayer/Makefile | 37 +++------------- Heiligste_Nacht/Makefile | 18 ++++---- Herbei_o_ihr_Glaeubgen/Makefile | 27 ++++-------- Herr_erbarme_dich_erbarme_dich/Makefile | 36 ++++------------ Herr_groszer_Gott/Makefile | 18 ++++---- Heut_gedenken_wir_der_Stunde/Makefile | 18 ++++---- Hevenu_schalom_alejchem/Makefile | 38 ++++------------- Hoere_nun_Herr_die_Bitten/Makefile | 37 +++------------- Horch_die_Wellen_tragen/Makefile | 37 +++------------- Ich_bin_die_Auferstehung/Makefile | 18 ++++---- Ich_freue_mich_im_Herrn/Makefile | 37 +++------------- Ich_glaub_an_einen_Gott_der_singt/Makefile | 37 +++------------- Ich_moecht_dass_einer_mit_mir_geht/Makefile | 28 ++++--------- Ich_sing_dir_mein_Lied/Makefile | 37 +++------------- Ich_steh_an_deinem_Kreuz/Makefile | 38 ++++------------- Ich_steh_an_deiner_Krippen_hier/Makefile | 27 ++++-------- Ich_steh_an_deiner_Krippen_hier_/Makefile | 27 ++++-------- Ich_traue_auf_dich/Makefile | 18 ++++---- Ich_wollt_ich_waer_ein_Huhn/Makefile | 18 ++++---- Ihr_Freunde_lasst_euch_sagen/Makefile | 37 +++------------- Im_Fruehling/Makefile | 18 ++++---- Immer_wieder_kommt_ein_neuer_Fruehling/Makefile | 37 +++------------- In_dieser_lieben_Sommerzeit/Makefile | 30 ++++--------- Ins_Wasser_faellt_ein_Stein/Makefile | 18 ++++---- Irische_Segenswuensche/Makefile | 18 ++++---- Irische_Segenswuensche_/Makefile | 18 ++++---- Ist_Gott_fuer_mich_so_trete/Makefile | 27 ++++-------- Jauchzet_dem_Herrn_alle_Welt_/Makefile | 18 ++++---- Jedes_Tierlein_hat_sein_Essen/Makefile | 38 ++++------------- Jena_Lied/Makefile | 27 ++++-------- Jerusalem/Makefile | 37 +++------------- Jubilate_Deo/Makefile | 18 ++++---- Kanons/Abendstille_ueberall/Makefile | 38 ++++------------- Kanons/Bittend_falten_wir_die_Haende/Makefile | 38 ++++------------- Kanons/Danket_danket_dem_Herrn/Makefile | 38 ++++------------- .../Makefile | 38 ++++------------- .../Der_selbst_den_Spatzen_gibt_zu_essen/Makefile | 38 ++++------------- Kanons/Du_bist_mein_ich_bin_dein/Makefile | 26 ++++-------- Kanons/Er_ist_wie_ein_Baum/Makefile | 38 ++++------------- Kanons/Fuer_heute_eine_gute_Nacht/Makefile | 38 ++++------------- Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile | 18 ++++---- Kanons/Gloria_/Makefile | 26 ++++-------- .../Makefile | 18 ++++---- Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile | 18 ++++---- Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile | 38 ++++------------- Kanons/Jahreslosung_2018/Makefile | 18 ++++---- Kanons/Kaffeeklatsch/Makefile | 26 ++++-------- Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile | 38 ++++------------- Kanons/Kommt_das_Essen_ist_bereitet/Makefile | 38 ++++------------- Kanons/Lobet_und_preiset/Makefile | 38 ++++------------- Kanons/Mache_dich_auf_und_werde_Licht/Makefile | 18 ++++---- Kanons/Segne_Herr_was_deine_Hand/Makefile | 38 ++++------------- Kanons/Segne_Vater_diese_Speise/Makefile | 38 ++++------------- Kanons/Und_wie_der_kleine_Vogel_singt/Makefile | 38 ++++------------- .../Welche_Farbe_hat_die_Welt/Makefile | 37 ++++------------ Koenig_mild_vertreibt_die_Finsternis/Makefile | 38 ++++------------- Komm_Gott_Schoepfer_Heiliger_Geist/Makefile | 35 ++++------------ Komm_Heilger_Geist/Makefile | 38 ++++------------- Komm_Heiliger_Geist/Makefile | 18 ++++---- Komm_in_unsre_stolze_Welt/Makefile | 37 ++++------------ Komm_zu_uns_in_deinem_Wort/Makefile | 42 ++++--------------- Kommet_ihr_Hirten/Makefile | 38 ++++------------- Kommt_herzu/Makefile | 18 ++++---- Kommt_mit_Gaben_und_Lobgesang/Makefile | 28 ++++--------- Korn_dass_in_die_Erde/Makefile | 37 +++------------- Kyrie/Makefile | 33 ++++----------- Laudate_omnes_gentes/Makefile | 18 ++++---- Lobe_den_Herren/Makefile | 33 ++++----------- Lobe_den_Herren_/Makefile | 34 ++++----------- Lobe_den_Herrn_meine_Seele/Makefile | 18 ++++---- Lobe_den_Herrn_meine_Seele_/Makefile | 18 ++++---- Lobet_den_Herren_alle/Makefile | 33 ++++----------- Lobet_den_Herrn_und_dankt_ihm_seine_Gaben/Makefile | 38 ++++------------- Lobsinget_Gott_dem_Herrn/Makefile | 24 ++++------- Macht_hoch_die_Tuer/Makefile | 49 ++++------------------ Macht_hoch_die_Tuer_/Makefile | 18 ++++---- Magnificat/Makefile | 30 ++++--------- Maria_durch_ein_Dornwald_ging/Makefile | 38 ++++------------- Mein_Jesus_ich_lieb_dich/Makefile | 18 ++++---- Meine_Hoffnung_und_meine_Freude/Makefile | 18 ++++---- Meine_Zeit/Makefile | 18 ++++---- Messias/Makefile | 18 ++++---- Mir_ist_Erbarmung_widerfahren/Makefile | 33 ++++----------- Missa_brevis/Makefile | 26 ++++-------- Missa_brevis_in_C/Makefile | 19 ++++----- Missa_in_C/Makefile | 26 ++++-------- .../Makefile | 18 ++++---- Morgenlicht_leuchtet/Makefile | 28 ++++--------- Naeher_mein_Gott_zu_dir/Makefile | 18 ++++---- Nicht_der_Anfang_nur_das_Ende/Makefile | 33 ++++----------- Noch_dringt_Jesu_frohe_Botschaft/Makefile | 33 ++++----------- Nun_bitten_wir_den_Heiligen_Geist/Makefile | 39 ++++------------- Nun_danket_alle_Gott/Makefile | 38 ++++------------- Nun_danket_alle_Gott_/Makefile | 38 ++++------------- Nun_danket_alle_Gott__/Makefile | 40 ++++-------------- Nun_komm_der_Heiden_Heiland_/Makefile | 18 ++++---- Nun_lasst_uns_Gott_dem_Herren_Dank_sagen/Makefile | 38 ++++------------- Nun_ruhen_alle_Waelder/Makefile | 18 ++++---- O_Haupt_voll_Blut_und_Wunden/Makefile | 38 ++++------------- O_Heiland_reisz_die_Himmel_auf/Makefile | 38 ++++------------- O_Jesu_Christe_wahres_Licht/Makefile | 18 ++++---- O_du_froehliche/Makefile | 36 ++++------------ O_du_stille_Zeit/Makefile | 33 ++++----------- O_komm_du_Geist_der_Wahrheit/Makefile | 35 ++++------------ Oeffne_den_Weg/Makefile | 18 ++++---- Pachelbels_Kanon_des_Friedens/Makefile | 18 ++++---- Pop_Messe/Makefile | 19 ++++----- Ronja_Raeubertochter/Makefile | 37 +++------------- Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile | 37 +++------------- Schalom/Makefile | 37 +++------------- Schmueckt_das_Fest_mit_Maien/Makefile | 5 ++- Schoen_ist_die_Erde/Makefile | 18 ++++---- Sein_Kleid_fuer_meins/Makefile | 18 ++++---- Selig_seid_ihr/Makefile | 18 ++++---- Shalom_aleichem/Makefile | 18 ++++---- Singet_dem_Herrn_ein_neues_Lied/Makefile | 18 ++++---- Singet_froh/Makefile | 18 ++++---- Sommerpsalm/Makefile | 18 ++++---- Sprichst_du_dein_Vaterunser/Makefile | 18 ++++---- Stern_ueber_Bethlehem/Makefile | 38 ++++------------- Stern_ueber_Bethlehem_/Makefile | 38 ++++------------- Still/Makefile | 37 ++++------------ Stups_der_kleine_Osterhase/Makefile | 37 +++------------- Tanzen_und_Springen/Makefile | 18 ++++---- Thank_you_for_the_music/Makefile | 9 +--- The_armed_man/Makefile | 26 ++++-------- The_blessing_of_Aaron/Makefile | 33 ++++----------- Tochter_Zion/Makefile | 38 ++++------------- Tretet_her_zum_Tisch_des_Herrn/Makefile | 38 ++++------------- Troestet_mein_Volk/Makefile | 18 ++++---- Ueber_dir_wach_ein_Engel/Makefile | 37 +++------------- Uebers_Gebirg_Maria_geht/Makefile | 38 ++++------------- Uns_ist_ein_Kind_geboren/Makefile | 26 ++++-------- Unser_Vater/Makefile | 38 ++++------------- Unser_Vater_/Makefile | 38 ++++------------- Veni_Creator_Spiritus/Makefile | 44 ++++--------------- Verleih_uns_Frieden/Makefile | 37 +++------------- Verleih_uns_Frieden_/Makefile | 18 ++++---- Verleih_uns_Frieden__/Makefile | 37 +++------------- Vertraut_den_neuen_Wegen/Makefile | 37 +++------------- Viele_verachten_die_edele_Musik/Makefile | 33 ++++----------- Vinum_schenk_ein/Makefile | 18 ++++---- Vom_Himmel_hoch_da_komm_ich_her/Makefile | 18 ++++---- Vom_Himmel_kam_der_Engel_Schar/Makefile | 18 ++++---- Von_guten_Maechten/Makefile | 37 +++------------- Wachet_auf_ruft_uns_die_Stimme/Makefile | 45 ++++---------------- Was_noch_frisch_und_jung_an_Jahren/Makefile | 37 +++------------- Weihnachtsmotette/Makefile | 38 ++++------------- Weil_Gott_in_tiefster_Nacht_erschienen/Makefile | 18 ++++---- Weil_ich_Jesu_Schaeflein_bin/Makefile | 37 ++++------------ Weiszt_du_wieviel_Sternlein_stehen/Makefile | 38 ++++------------- Welch_ein_Freund_ist_unser_Jesus/Makefile | 33 ++++----------- Wenn_Mozart_nicht_gestorben_waer/Makefile | 18 ++++---- Wer_bis_an_das_Ende_beharrt/Makefile | 18 ++++---- Wer_kann_segeln/Makefile | 18 ++++---- Wie_lieb_sind_mir_deine_Wohnungen/Makefile | 37 ++++------------ Wie_lieblich_ist_der_Maien/Makefile | 33 ++++----------- Wie_lieblich_ist_der_Maien_/Makefile | 33 ++++----------- Wie_soll_ich_dich_empfangen/Makefile | 18 ++++---- Wir_danken_Gott_fuer_seine_Gaben/Makefile | 38 ++++------------- Wir_danken_dir_Herr_Jesu_Christ/Makefile | 38 ++++------------- Wir_wuenschen_Gottes_Segen/Makefile | 37 ++++------------ .../Makefile | 37 +++------------- Yesterday/Makefile | 37 +++------------- wo/Makefile | 17 ++++---- 253 files changed, 1949 insertions(+), 5476 deletions(-) diff --git a/Abend_wird_es_wieder/Makefile b/Abend_wird_es_wieder/Makefile index cd041e4..cb66cc7 100644 --- a/Abend_wird_es_wieder/Makefile +++ b/Abend_wird_es_wieder/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Abend_wird_es_wieder_/Makefile b/Abend_wird_es_wieder_/Makefile index cd041e4..cb66cc7 100644 --- a/Abend_wird_es_wieder_/Makefile +++ b/Abend_wird_es_wieder_/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Abendruhe/Makefile b/Abendruhe/Makefile index 300cdb2..cb66cc7 100644 --- a/Abendruhe/Makefile +++ b/Abendruhe/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Aennchen_von_Tharau/Makefile b/Aennchen_von_Tharau/Makefile index 9a5f07f..cb66cc7 100644 --- a/Aennchen_von_Tharau/Makefile +++ b/Aennchen_von_Tharau/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Aennchen_von_Tharau_/Makefile b/Aennchen_von_Tharau_/Makefile index 9a5f07f..cb66cc7 100644 --- a/Aennchen_von_Tharau_/Makefile +++ b/Aennchen_von_Tharau_/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Alle_Jahre_wieder_/Makefile b/Alle_Jahre_wieder_/Makefile index 300cdb2..cb66cc7 100644 --- a/Alle_Jahre_wieder_/Makefile +++ b/Alle_Jahre_wieder_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Alle_Tage_alle_Naechte/Makefile b/Alle_Tage_alle_Naechte/Makefile index 300cdb2..cb66cc7 100644 --- a/Alle_Tage_alle_Naechte/Makefile +++ b/Alle_Tage_alle_Naechte/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Alle_gute_Gabe_kommt_her_von_Gott_dem_Herrn/Makefile b/Alle_gute_Gabe_kommt_her_von_Gott_dem_Herrn/Makefile index fec5612..cb66cc7 100644 --- a/Alle_gute_Gabe_kommt_her_von_Gott_dem_Herrn/Makefile +++ b/Alle_gute_Gabe_kommt_her_von_Gott_dem_Herrn/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Alle_guten_Gaben_alles_was_wir_haben/Makefile b/Alle_guten_Gaben_alles_was_wir_haben/Makefile index fec5612..cb66cc7 100644 --- a/Alle_guten_Gaben_alles_was_wir_haben/Makefile +++ b/Alle_guten_Gaben_alles_was_wir_haben/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Aller_Augen_warten_auf_dich_Herre/Makefile b/Aller_Augen_warten_auf_dich_Herre/Makefile index fec5612..cb66cc7 100644 --- a/Aller_Augen_warten_auf_dich_Herre/Makefile +++ b/Aller_Augen_warten_auf_dich_Herre/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Als_Gott_die_Welt_erschaffen/Makefile b/Als_Gott_die_Welt_erschaffen/Makefile index cd041e4..cb66cc7 100644 --- a/Als_Gott_die_Welt_erschaffen/Makefile +++ b/Als_Gott_die_Welt_erschaffen/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Als_die_Welt_verloren/Makefile b/Als_die_Welt_verloren/Makefile index de7ffb7..cb66cc7 100644 --- a/Als_die_Welt_verloren/Makefile +++ b/Als_die_Welt_verloren/Makefile @@ -1,14 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -OBERSTIMME=[1-3] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -18,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@;\ - s/%Oberstimme_$(OBERSTIMME)%//;\ - /%Oberstimme_.*%/d" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Auf_Bethlehems_Feldern/Makefile b/Auf_Bethlehems_Feldern/Makefile index fec5612..cb66cc7 100644 --- a/Auf_Bethlehems_Feldern/Makefile +++ b/Auf_Bethlehems_Feldern/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Auf_meinen_lieben_Gott/Makefile b/Auf_meinen_lieben_Gott/Makefile index a190388..cb66cc7 100644 --- a/Auf_meinen_lieben_Gott/Makefile +++ b/Auf_meinen_lieben_Gott/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif - -ifeq ($(UNTERSTIMME),1) - UNTERSTIMMEN_REGEX=s/%Unterstimme%//; -else - UNTERSTIMMEN_REGEX=/%Unterstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d; \ - $(OBERSTIMMEN_REGEX) \ - $(UNTERSTIMMEN_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Aus_Gnade/Makefile b/Aus_Gnade/Makefile index 300cdb2..cb66cc7 100644 --- a/Aus_Gnade/Makefile +++ b/Aus_Gnade/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Befiehl_dem_Herren_deine_Wege/Makefile b/Befiehl_dem_Herren_deine_Wege/Makefile index cd041e4..cb66cc7 100644 --- a/Befiehl_dem_Herren_deine_Wege/Makefile +++ b/Befiehl_dem_Herren_deine_Wege/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Bewahr_die_Erde/Makefile b/Bewahr_die_Erde/Makefile index cd041e4..cb66cc7 100644 --- a/Bewahr_die_Erde/Makefile +++ b/Bewahr_die_Erde/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Bewahr_die_Erde_Gott/Makefile b/Bewahr_die_Erde_Gott/Makefile index cd041e4..cb66cc7 100644 --- a/Bewahr_die_Erde_Gott/Makefile +++ b/Bewahr_die_Erde_Gott/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Bewahre_uns_Gott/Makefile b/Bewahre_uns_Gott/Makefile index 29d8d9d..cb66cc7 100644 --- a/Bewahre_uns_Gott/Makefile +++ b/Bewahre_uns_Gott/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Bleib_bei_mir_Herr/Makefile b/Bleib_bei_mir_Herr/Makefile index 300cdb2..cb66cc7 100644 --- a/Bleib_bei_mir_Herr/Makefile +++ b/Bleib_bei_mir_Herr/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Brich_an_du_schoenes_Morgenlicht/Makefile b/Brich_an_du_schoenes_Morgenlicht/Makefile index 300cdb2..cb66cc7 100644 --- a/Brich_an_du_schoenes_Morgenlicht/Makefile +++ b/Brich_an_du_schoenes_Morgenlicht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Brich_mit_den_Hungrigen_dein_Brot/Makefile b/Brich_mit_den_Hungrigen_dein_Brot/Makefile index 1b753e8..cb66cc7 100644 --- a/Brich_mit_den_Hungrigen_dein_Brot/Makefile +++ b/Brich_mit_den_Hungrigen_dein_Brot/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Brunnquell_aller_Gueter/Makefile b/Brunnquell_aller_Gueter/Makefile index 0b6245d..cb66cc7 100644 --- a/Brunnquell_aller_Gueter/Makefile +++ b/Brunnquell_aller_Gueter/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Cantate_Domino/Makefile b/Cantate_Domino/Makefile index 61cfebc..cb66cc7 100644 --- a/Cantate_Domino/Makefile +++ b/Cantate_Domino/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.2) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Christe_du_bist_der_helle_Tag/Makefile b/Christe_du_bist_der_helle_Tag/Makefile index fec5612..cb66cc7 100644 --- a/Christe_du_bist_der_helle_Tag/Makefile +++ b/Christe_du_bist_der_helle_Tag/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Da_beruehren_sich_Himmel_und_Erde/Makefile b/Da_beruehren_sich_Himmel_und_Erde/Makefile index cd041e4..cb66cc7 100644 --- a/Da_beruehren_sich_Himmel_und_Erde/Makefile +++ b/Da_beruehren_sich_Himmel_und_Erde/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Danke_fuer_diesen_schoenen_Abend/Makefile b/Danke_fuer_diesen_schoenen_Abend/Makefile index fec5612..cb66cc7 100644 --- a/Danke_fuer_diesen_schoenen_Abend/Makefile +++ b/Danke_fuer_diesen_schoenen_Abend/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Danket_dem_Herrn/Makefile b/Danket_dem_Herrn/Makefile index fec5612..cb66cc7 100644 --- a/Danket_dem_Herrn/Makefile +++ b/Danket_dem_Herrn/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Das_Jahr_steht_auf_der_Hoehe/Makefile b/Das_Jahr_steht_auf_der_Hoehe/Makefile index 300cdb2..cb66cc7 100644 --- a/Das_Jahr_steht_auf_der_Hoehe/Makefile +++ b/Das_Jahr_steht_auf_der_Hoehe/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Das_grosze_Wunder_hat_ganz_klein_begonnen/Makefile b/Das_grosze_Wunder_hat_ganz_klein_begonnen/Makefile index 404faec..cb66cc7 100644 --- a/Das_grosze_Wunder_hat_ganz_klein_begonnen/Makefile +++ b/Das_grosze_Wunder_hat_ganz_klein_begonnen/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Dein_Kreuz_Herr_Jesus/Makefile b/Dein_Kreuz_Herr_Jesus/Makefile index f90ee14..cb66cc7 100644 --- a/Dein_Kreuz_Herr_Jesus/Makefile +++ b/Dein_Kreuz_Herr_Jesus/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre satz.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Den_Tag_an_dem_wir_feiern_segne_Gott/Makefile b/Den_Tag_an_dem_wir_feiern_segne_Gott/Makefile index 404faec..cb66cc7 100644 --- a/Den_Tag_an_dem_wir_feiern_segne_Gott/Makefile +++ b/Den_Tag_an_dem_wir_feiern_segne_Gott/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Denn_er_hat_seinen_Engeln_/Makefile b/Denn_er_hat_seinen_Engeln_/Makefile index 9a5f07f..cb66cc7 100644 --- a/Denn_er_hat_seinen_Engeln_/Makefile +++ b/Denn_er_hat_seinen_Engeln_/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Denn_er_hat_seinen_Engeln__/Makefile b/Denn_er_hat_seinen_Engeln__/Makefile index 300cdb2..cb66cc7 100644 --- a/Denn_er_hat_seinen_Engeln__/Makefile +++ b/Denn_er_hat_seinen_Engeln__/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Der_Maie_bringt_uns_der_Bluemlein_viel/Makefile b/Der_Maie_bringt_uns_der_Bluemlein_viel/Makefile index cd041e4..cb66cc7 100644 --- a/Der_Maie_bringt_uns_der_Bluemlein_viel/Makefile +++ b/Der_Maie_bringt_uns_der_Bluemlein_viel/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Der_Morgenstern_ist_aufgedrungen/Makefile b/Der_Morgenstern_ist_aufgedrungen/Makefile index 8e0b8b0..cb66cc7 100644 --- a/Der_Morgenstern_ist_aufgedrungen/Makefile +++ b/Der_Morgenstern_ist_aufgedrungen/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STIMME=SOPRAN\|ALT\|TENOR\|BASS - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@; \ - $(MIDI_REGEX); \ - /%$(STIMME)%/{ \ - s/%[A-Z]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf %.midi: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Der_Tag_ist_seiner_Hoehe_nah/Makefile b/Der_Tag_ist_seiner_Hoehe_nah/Makefile index fec5612..cb66cc7 100644 --- a/Der_Tag_ist_seiner_Hoehe_nah/Makefile +++ b/Der_Tag_ist_seiner_Hoehe_nah/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Der_Tag_mein_Gott_ist_nun_vergangen/Makefile b/Der_Tag_mein_Gott_ist_nun_vergangen/Makefile index f86b876..cb66cc7 100644 --- a/Der_Tag_mein_Gott_ist_nun_vergangen/Makefile +++ b/Der_Tag_mein_Gott_ist_nun_vergangen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Botschaft/Makefile b/Die_Botschaft/Makefile index cd041e4..cb66cc7 100644 --- a/Die_Botschaft/Makefile +++ b/Die_Botschaft/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Himmel_erzaehlen/Makefile b/Die_Himmel_erzaehlen/Makefile index 300cdb2..cb66cc7 100644 --- a/Die_Himmel_erzaehlen/Makefile +++ b/Die_Himmel_erzaehlen/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Himmel_ruehmen/Makefile b/Die_Himmel_ruehmen/Makefile index 0b6245d..cb66cc7 100644 --- a/Die_Himmel_ruehmen/Makefile +++ b/Die_Himmel_ruehmen/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Nacht_ist_vorgedrungen/Makefile b/Die_Nacht_ist_vorgedrungen/Makefile index 856e798..cb66cc7 100644 --- a/Die_Nacht_ist_vorgedrungen/Makefile +++ b/Die_Nacht_ist_vorgedrungen/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Sonne_sinkt_ins_Meer/Makefile b/Die_Sonne_sinkt_ins_Meer/Makefile index cd041e4..cb66cc7 100644 --- a/Die_Sonne_sinkt_ins_Meer/Makefile +++ b/Die_Sonne_sinkt_ins_Meer/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_Weihnachtsgeschichte/Makefile b/Die_Weihnachtsgeschichte/Makefile index 07dc577..cb66cc7 100644 --- a/Die_Weihnachtsgeschichte/Makefile +++ b/Die_Weihnachtsgeschichte/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly parts/*.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_beste_Zeit_im_Jahr_ist_mein/Makefile b/Die_beste_Zeit_im_Jahr_ist_mein/Makefile index 300cdb2..cb66cc7 100644 --- a/Die_beste_Zeit_im_Jahr_ist_mein/Makefile +++ b/Die_beste_Zeit_im_Jahr_ist_mein/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Die_beste_Zeit_im_Jahr_ist_mein_/Makefile b/Die_beste_Zeit_im_Jahr_ist_mein_/Makefile index 300cdb2..cb66cc7 100644 --- a/Die_beste_Zeit_im_Jahr_ist_mein_/Makefile +++ b/Die_beste_Zeit_im_Jahr_ist_mein_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Drei_Koenige_wandern/Makefile b/Drei_Koenige_wandern/Makefile index 404faec..cb66cc7 100644 --- a/Drei_Koenige_wandern/Makefile +++ b/Drei_Koenige_wandern/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Du_Morgenstern_du_Licht_vom_Licht/Makefile b/Du_Morgenstern_du_Licht_vom_Licht/Makefile index 300cdb2..cb66cc7 100644 --- a/Du_Morgenstern_du_Licht_vom_Licht/Makefile +++ b/Du_Morgenstern_du_Licht_vom_Licht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Du_bist_der_Ehrenkoenig/Makefile b/Du_bist_der_Ehrenkoenig/Makefile index 9a5f07f..cb66cc7 100644 --- a/Du_bist_der_Ehrenkoenig/Makefile +++ b/Du_bist_der_Ehrenkoenig/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Du_bist_o_Gott_der_Herr_der_Zeit/Makefile b/Du_bist_o_Gott_der_Herr_der_Zeit/Makefile index 300cdb2..cb66cc7 100644 --- a/Du_bist_o_Gott_der_Herr_der_Zeit/Makefile +++ b/Du_bist_o_Gott_der_Herr_der_Zeit/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile b/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile index 0b6245d..cb66cc7 100644 --- a/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile +++ b/Du_bists_dem_Ruhm_und_Ehre_gebuehret/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Dunkel_geworden_sind_meine_Augen/Makefile b/Dunkel_geworden_sind_meine_Augen/Makefile index f86b876..cb66cc7 100644 --- a/Dunkel_geworden_sind_meine_Augen/Makefile +++ b/Dunkel_geworden_sind_meine_Augen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ehre_sei_Gott_in_der_Hoehe/Makefile b/Ehre_sei_Gott_in_der_Hoehe/Makefile index e8f3965..cb66cc7 100644 --- a/Ehre_sei_Gott_in_der_Hoehe/Makefile +++ b/Ehre_sei_Gott_in_der_Hoehe/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIT_CHORAL),1) - WSIDE=s/^%Wside%// -else - WSIDE=/^%Wside%/d -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@; \ - $(WSIDE) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre stimmen.pre texte.pre - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ein_Stern_strahlt/Makefile b/Ein_Stern_strahlt/Makefile index 300cdb2..cb66cc7 100644 --- a/Ein_Stern_strahlt/Makefile +++ b/Ein_Stern_strahlt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ein_Wandervolk/Makefile b/Ein_Wandervolk/Makefile index 300cdb2..cb66cc7 100644 --- a/Ein_Wandervolk/Makefile +++ b/Ein_Wandervolk/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ein_feste_Burg_ist_unser_Gott/Makefile b/Ein_feste_Burg_ist_unser_Gott/Makefile index 25ed397..cb66cc7 100644 --- a/Ein_feste_Burg_ist_unser_Gott/Makefile +++ b/Ein_feste_Burg_ist_unser_Gott/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Er_ist_mein_Hirt/Makefile b/Er_ist_mein_Hirt/Makefile index 300cdb2..cb66cc7 100644 --- a/Er_ist_mein_Hirt/Makefile +++ b/Er_ist_mein_Hirt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Er_weckt_mich_alle_Morgen/Makefile b/Er_weckt_mich_alle_Morgen/Makefile index f86b876..cb66cc7 100644 --- a/Er_weckt_mich_alle_Morgen/Makefile +++ b/Er_weckt_mich_alle_Morgen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Es_ist_ein_Ros_entsprungen/Makefile b/Es_ist_ein_Ros_entsprungen/Makefile index 8f8fa34..cb66cc7 100644 --- a/Es_ist_ein_Ros_entsprungen/Makefile +++ b/Es_ist_ein_Ros_entsprungen/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,19 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - s/%Variante_$(VARIANTE)%//; \ - /%[A-Z_0-9]\+%/d ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre artikulation.ly satz.pre stimmen.pre texte.pre +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Es_ist_kein_Raum_fuer_dich/Makefile b/Es_ist_kein_Raum_fuer_dich/Makefile index 300cdb2..cb66cc7 100644 --- a/Es_ist_kein_Raum_fuer_dich/Makefile +++ b/Es_ist_kein_Raum_fuer_dich/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Es_kommt_ein_Schiff_geladen/Makefile b/Es_kommt_ein_Schiff_geladen/Makefile index fec5612..cb66cc7 100644 --- a/Es_kommt_ein_Schiff_geladen/Makefile +++ b/Es_kommt_ein_Schiff_geladen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Exsultate_Deo/Makefile b/Exsultate_Deo/Makefile index 0b6245d..cb66cc7 100644 --- a/Exsultate_Deo/Makefile +++ b/Exsultate_Deo/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Freu_dich_Erd_und_Sternenzelt/Makefile b/Freu_dich_Erd_und_Sternenzelt/Makefile index 1ab8feb..cb66cc7 100644 --- a/Freu_dich_Erd_und_Sternenzelt/Makefile +++ b/Freu_dich_Erd_und_Sternenzelt/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre artikulation.ly satz.pre stimmen.pre texte.pre +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Freude_grosze_Freude/Makefile b/Freude_grosze_Freude/Makefile index 300cdb2..cb66cc7 100644 --- a/Freude_grosze_Freude/Makefile +++ b/Freude_grosze_Freude/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Freuet_euch_allezeit/Makefile b/Freuet_euch_allezeit/Makefile index 404faec..cb66cc7 100644 --- a/Freuet_euch_allezeit/Makefile +++ b/Freuet_euch_allezeit/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Freuet_euch_ihr_Christen_alle/Makefile b/Freuet_euch_ihr_Christen_alle/Makefile index 856e798..cb66cc7 100644 --- a/Freuet_euch_ihr_Christen_alle/Makefile +++ b/Freuet_euch_ihr_Christen_alle/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Freut_euch_von_Herzen/Makefile b/Freut_euch_von_Herzen/Makefile index fec5612..cb66cc7 100644 --- a/Freut_euch_von_Herzen/Makefile +++ b/Freut_euch_von_Herzen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Friede_erfuellet_Stadt_und_Land/Makefile b/Friede_erfuellet_Stadt_und_Land/Makefile index 300cdb2..cb66cc7 100644 --- a/Friede_erfuellet_Stadt_und_Land/Makefile +++ b/Friede_erfuellet_Stadt_und_Land/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Friede_mit_euch/Makefile b/Friede_mit_euch/Makefile index 300cdb2..cb66cc7 100644 --- a/Friede_mit_euch/Makefile +++ b/Friede_mit_euch/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Froehlich_soll_mein_Herze_springen/Makefile b/Froehlich_soll_mein_Herze_springen/Makefile index cd041e4..cb66cc7 100644 --- a/Froehlich_soll_mein_Herze_springen/Makefile +++ b/Froehlich_soll_mein_Herze_springen/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Froehlich_soll_mein_Herze_springen_/Makefile b/Froehlich_soll_mein_Herze_springen_/Makefile index 70c3ebd..cb66cc7 100644 --- a/Froehlich_soll_mein_Herze_springen_/Makefile +++ b/Froehlich_soll_mein_Herze_springen_/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre satz.pre stimmen.ly texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Froehlich_soll_mein_Herze_springen__/Makefile b/Froehlich_soll_mein_Herze_springen__/Makefile index 2bae4da..cb66cc7 100644 --- a/Froehlich_soll_mein_Herze_springen__/Makefile +++ b/Froehlich_soll_mein_Herze_springen__/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre satz.pre stimmen.ly texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Froehlich_soll_mein_Herze_springen_kombiniert_E_dur/Makefile b/Froehlich_soll_mein_Herze_springen_kombiniert_E_dur/Makefile index fdef9cb..cb66cc7 100644 --- a/Froehlich_soll_mein_Herze_springen_kombiniert_E_dur/Makefile +++ b/Froehlich_soll_mein_Herze_springen_kombiniert_E_dur/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,20 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -Froehlich_soll_mein_Herze_springen_kombiniert_E_dur.pre: Froehlich_soll_mein_Herze_springen_kombiniert_E_dur.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" +include ../.meta/*.mk -3_satz.pre: ../Froehlich_soll_mein_Herze_springen_/satz.ly - sed 's/%STR_2%//;/%[A-Z_0-9]\+%/d' "$<" > "$@" +%.pre: %.ly + cat "$<" > "$@" -4_satz.pre: ../Froehlich_soll_mein_Herze_springen__/satz.ly - sed 's/%STR_11\?%//;/%[A-Z_0-9]\+%/d' "$<" > "$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -Froehlich_soll_mein_Herze_springen_kombiniert_E_dur.pdf: Froehlich_soll_mein_Herze_springen_kombiniert_E_dur.pre \ - 4_satz.pre \ - ../Froehlich_soll_mein_Herze_springen__/stimmen.ly \ - ../Froehlich_soll_mein_Herze_springen__/texte.ly \ - 3_satz.pre \ - ../Froehlich_soll_mein_Herze_springen_/stimmen.ly \ - ../Froehlich_soll_mein_Herze_springen_/texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Froehlichkeit_und_leichtes_Leben/Makefile b/Froehlichkeit_und_leichtes_Leben/Makefile index 9a5f07f..cb66cc7 100644 --- a/Froehlichkeit_und_leichtes_Leben/Makefile +++ b/Froehlichkeit_und_leichtes_Leben/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Fuellt_die_Kruege_mit_Wasser/Makefile b/Fuellt_die_Kruege_mit_Wasser/Makefile index 300cdb2..cb66cc7 100644 --- a/Fuellt_die_Kruege_mit_Wasser/Makefile +++ b/Fuellt_die_Kruege_mit_Wasser/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Fuerchtet_euch_nicht/Makefile b/Fuerchtet_euch_nicht/Makefile index 300cdb2..cb66cc7 100644 --- a/Fuerchtet_euch_nicht/Makefile +++ b/Fuerchtet_euch_nicht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Geh_aus_mein_Herz/Makefile b/Geh_aus_mein_Herz/Makefile index 300cdb2..cb66cc7 100644 --- a/Geh_aus_mein_Herz/Makefile +++ b/Geh_aus_mein_Herz/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Geh_unter_der_Gnade/Makefile b/Geh_unter_der_Gnade/Makefile index 9a5f07f..cb66cc7 100644 --- a/Geh_unter_der_Gnade/Makefile +++ b/Geh_unter_der_Gnade/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gib_Frieden_Herr_gib_Frieden/Makefile b/Gib_Frieden_Herr_gib_Frieden/Makefile index 1b753e8..cb66cc7 100644 --- a/Gib_Frieden_Herr_gib_Frieden/Makefile +++ b/Gib_Frieden_Herr_gib_Frieden/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gloria_in_D/Makefile b/Gloria_in_D/Makefile index d7fe0f3..cb66cc7 100644 --- a/Gloria_in_D/Makefile +++ b/Gloria_in_D/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_der_seine_Kinder_liebt/Makefile b/Gott_der_seine_Kinder_liebt/Makefile index 9a5f07f..cb66cc7 100644 --- a/Gott_der_seine_Kinder_liebt/Makefile +++ b/Gott_der_seine_Kinder_liebt/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_giebet_Speise_reichlich_und_ueberall/Makefile b/Gott_giebet_Speise_reichlich_und_ueberall/Makefile index fec5612..cb66cc7 100644 --- a/Gott_giebet_Speise_reichlich_und_ueberall/Makefile +++ b/Gott_giebet_Speise_reichlich_und_ueberall/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile b/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile index 9a5f07f..cb66cc7 100644 --- a/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile +++ b/Gott_hat_mir_laengst_einen_Engel_gesandt/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_ist_treu/Makefile b/Gott_ist_treu/Makefile index 9a5f07f..cb66cc7 100644 --- a/Gott_ist_treu/Makefile +++ b/Gott_ist_treu/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Gott_soll_es_sein/Makefile b/Gott_soll_es_sein/Makefile index 300cdb2..cb66cc7 100644 --- a/Gott_soll_es_sein/Makefile +++ b/Gott_soll_es_sein/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Grosz_ist_der_Herr/Makefile b/Grosz_ist_der_Herr/Makefile index 300cdb2..cb66cc7 100644 --- a/Grosz_ist_der_Herr/Makefile +++ b/Grosz_ist_der_Herr/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Halleluja/Makefile b/Halleluja/Makefile index 300cdb2..cb66cc7 100644 --- a/Halleluja/Makefile +++ b/Halleluja/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Halte_deine_Traeume_fest/Makefile b/Halte_deine_Traeume_fest/Makefile index 404faec..cb66cc7 100644 --- a/Halte_deine_Traeume_fest/Makefile +++ b/Halte_deine_Traeume_fest/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Hear_my_prayer/Makefile b/Hear_my_prayer/Makefile index 9a5f07f..cb66cc7 100644 --- a/Hear_my_prayer/Makefile +++ b/Hear_my_prayer/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Heiligste_Nacht/Makefile b/Heiligste_Nacht/Makefile index 300cdb2..cb66cc7 100644 --- a/Heiligste_Nacht/Makefile +++ b/Heiligste_Nacht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Herbei_o_ihr_Glaeubgen/Makefile b/Herbei_o_ihr_Glaeubgen/Makefile index 8d6de5c..cb66cc7 100644 --- a/Herbei_o_ihr_Glaeubgen/Makefile +++ b/Herbei_o_ihr_Glaeubgen/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Herr_erbarme_dich_erbarme_dich/Makefile b/Herr_erbarme_dich_erbarme_dich/Makefile index a91d45a..cb66cc7 100644 --- a/Herr_erbarme_dich_erbarme_dich/Makefile +++ b/Herr_erbarme_dich_erbarme_dich/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -UNTERSTIMMEN=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(UNTERSTIMMEN),1) - UNTERSTIMMEN_REGEX=s@%unterstimme%@@ -else - UNTERSTIMMEN_REGEX= -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,19 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(UNTERSTIMMEN_REGEX); \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Herr_groszer_Gott/Makefile b/Herr_groszer_Gott/Makefile index 300cdb2..cb66cc7 100644 --- a/Herr_groszer_Gott/Makefile +++ b/Herr_groszer_Gott/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Heut_gedenken_wir_der_Stunde/Makefile b/Heut_gedenken_wir_der_Stunde/Makefile index 300cdb2..cb66cc7 100644 --- a/Heut_gedenken_wir_der_Stunde/Makefile +++ b/Heut_gedenken_wir_der_Stunde/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Hevenu_schalom_alejchem/Makefile b/Hevenu_schalom_alejchem/Makefile index fec5612..cb66cc7 100644 --- a/Hevenu_schalom_alejchem/Makefile +++ b/Hevenu_schalom_alejchem/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Hoere_nun_Herr_die_Bitten/Makefile b/Hoere_nun_Herr_die_Bitten/Makefile index 9a5f07f..cb66cc7 100644 --- a/Hoere_nun_Herr_die_Bitten/Makefile +++ b/Hoere_nun_Herr_die_Bitten/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Horch_die_Wellen_tragen/Makefile b/Horch_die_Wellen_tragen/Makefile index 9a5f07f..cb66cc7 100644 --- a/Horch_die_Wellen_tragen/Makefile +++ b/Horch_die_Wellen_tragen/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_bin_die_Auferstehung/Makefile b/Ich_bin_die_Auferstehung/Makefile index 300cdb2..cb66cc7 100644 --- a/Ich_bin_die_Auferstehung/Makefile +++ b/Ich_bin_die_Auferstehung/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_freue_mich_im_Herrn/Makefile b/Ich_freue_mich_im_Herrn/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ich_freue_mich_im_Herrn/Makefile +++ b/Ich_freue_mich_im_Herrn/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_glaub_an_einen_Gott_der_singt/Makefile b/Ich_glaub_an_einen_Gott_der_singt/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ich_glaub_an_einen_Gott_der_singt/Makefile +++ b/Ich_glaub_an_einen_Gott_der_singt/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_moecht_dass_einer_mit_mir_geht/Makefile b/Ich_moecht_dass_einer_mit_mir_geht/Makefile index 29d8d9d..cb66cc7 100644 --- a/Ich_moecht_dass_einer_mit_mir_geht/Makefile +++ b/Ich_moecht_dass_einer_mit_mir_geht/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_sing_dir_mein_Lied/Makefile b/Ich_sing_dir_mein_Lied/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ich_sing_dir_mein_Lied/Makefile +++ b/Ich_sing_dir_mein_Lied/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_steh_an_deinem_Kreuz/Makefile b/Ich_steh_an_deinem_Kreuz/Makefile index f86b876..cb66cc7 100644 --- a/Ich_steh_an_deinem_Kreuz/Makefile +++ b/Ich_steh_an_deinem_Kreuz/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_steh_an_deiner_Krippen_hier/Makefile b/Ich_steh_an_deiner_Krippen_hier/Makefile index 856e798..cb66cc7 100644 --- a/Ich_steh_an_deiner_Krippen_hier/Makefile +++ b/Ich_steh_an_deiner_Krippen_hier/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_steh_an_deiner_Krippen_hier_/Makefile b/Ich_steh_an_deiner_Krippen_hier_/Makefile index 856e798..cb66cc7 100644 --- a/Ich_steh_an_deiner_Krippen_hier_/Makefile +++ b/Ich_steh_an_deiner_Krippen_hier_/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_traue_auf_dich/Makefile b/Ich_traue_auf_dich/Makefile index 300cdb2..cb66cc7 100644 --- a/Ich_traue_auf_dich/Makefile +++ b/Ich_traue_auf_dich/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ich_wollt_ich_waer_ein_Huhn/Makefile b/Ich_wollt_ich_waer_ein_Huhn/Makefile index 300cdb2..cb66cc7 100644 --- a/Ich_wollt_ich_waer_ein_Huhn/Makefile +++ b/Ich_wollt_ich_waer_ein_Huhn/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ihr_Freunde_lasst_euch_sagen/Makefile b/Ihr_Freunde_lasst_euch_sagen/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ihr_Freunde_lasst_euch_sagen/Makefile +++ b/Ihr_Freunde_lasst_euch_sagen/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Im_Fruehling/Makefile b/Im_Fruehling/Makefile index 300cdb2..cb66cc7 100644 --- a/Im_Fruehling/Makefile +++ b/Im_Fruehling/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile b/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile index 9a5f07f..cb66cc7 100644 --- a/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile +++ b/Immer_wieder_kommt_ein_neuer_Fruehling/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/In_dieser_lieben_Sommerzeit/Makefile b/In_dieser_lieben_Sommerzeit/Makefile index fdc48f6..cb66cc7 100644 --- a/In_dieser_lieben_Sommerzeit/Makefile +++ b/In_dieser_lieben_Sommerzeit/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(SPRACHE),se) - SPRACHEN_REGEX=/textD/d -else - ifeq ($(SPRACHE),alle) - SPRACHEN_REGEX= - else - ifeq ($(SPRACHE),) - SPRACHEN_REGEX=/textS/d - endif - endif -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@;$(SPRACHEN_REGEX)" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ins_Wasser_faellt_ein_Stein/Makefile b/Ins_Wasser_faellt_ein_Stein/Makefile index 300cdb2..cb66cc7 100644 --- a/Ins_Wasser_faellt_ein_Stein/Makefile +++ b/Ins_Wasser_faellt_ein_Stein/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Irische_Segenswuensche/Makefile b/Irische_Segenswuensche/Makefile index 300cdb2..cb66cc7 100644 --- a/Irische_Segenswuensche/Makefile +++ b/Irische_Segenswuensche/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Irische_Segenswuensche_/Makefile b/Irische_Segenswuensche_/Makefile index 300cdb2..cb66cc7 100644 --- a/Irische_Segenswuensche_/Makefile +++ b/Irische_Segenswuensche_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ist_Gott_fuer_mich_so_trete/Makefile b/Ist_Gott_fuer_mich_so_trete/Makefile index 25ed397..cb66cc7 100644 --- a/Ist_Gott_fuer_mich_so_trete/Makefile +++ b/Ist_Gott_fuer_mich_so_trete/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Jauchzet_dem_Herrn_alle_Welt_/Makefile b/Jauchzet_dem_Herrn_alle_Welt_/Makefile index 300cdb2..cb66cc7 100644 --- a/Jauchzet_dem_Herrn_alle_Welt_/Makefile +++ b/Jauchzet_dem_Herrn_alle_Welt_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Jedes_Tierlein_hat_sein_Essen/Makefile b/Jedes_Tierlein_hat_sein_Essen/Makefile index fec5612..cb66cc7 100644 --- a/Jedes_Tierlein_hat_sein_Essen/Makefile +++ b/Jedes_Tierlein_hat_sein_Essen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Jena_Lied/Makefile b/Jena_Lied/Makefile index 2744d19..cb66cc7 100644 --- a/Jena_Lied/Makefile +++ b/Jena_Lied/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(BASS),1) - BASS_REGEX= -else - BASS_REGEX=/%Bass%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(BASS_REGEX) ; \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Jerusalem/Makefile b/Jerusalem/Makefile index ffb849e..cb66cc7 100644 --- a/Jerusalem/Makefile +++ b/Jerusalem/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta parts/*.ly +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Jubilate_Deo/Makefile b/Jubilate_Deo/Makefile index 300cdb2..cb66cc7 100644 --- a/Jubilate_Deo/Makefile +++ b/Jubilate_Deo/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Abendstille_ueberall/Makefile b/Kanons/Abendstille_ueberall/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Abendstille_ueberall/Makefile +++ b/Kanons/Abendstille_ueberall/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Bittend_falten_wir_die_Haende/Makefile b/Kanons/Bittend_falten_wir_die_Haende/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Bittend_falten_wir_die_Haende/Makefile +++ b/Kanons/Bittend_falten_wir_die_Haende/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Danket_danket_dem_Herrn/Makefile b/Kanons/Danket_danket_dem_Herrn/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Danket_danket_dem_Herrn/Makefile +++ b/Kanons/Danket_danket_dem_Herrn/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile b/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile +++ b/Kanons/Der_Herrgott_laesst_wachsen_das_taegliche_Brot/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile b/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile +++ b/Kanons/Der_selbst_den_Spatzen_gibt_zu_essen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Du_bist_mein_ich_bin_dein/Makefile b/Kanons/Du_bist_mein_ich_bin_dein/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Du_bist_mein_ich_bin_dein/Makefile +++ b/Kanons/Du_bist_mein_ich_bin_dein/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Er_ist_wie_ein_Baum/Makefile b/Kanons/Er_ist_wie_ein_Baum/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Er_ist_wie_ein_Baum/Makefile +++ b/Kanons/Er_ist_wie_ein_Baum/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Fuer_heute_eine_gute_Nacht/Makefile b/Kanons/Fuer_heute_eine_gute_Nacht/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Fuer_heute_eine_gute_Nacht/Makefile +++ b/Kanons/Fuer_heute_eine_gute_Nacht/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile b/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile +++ b/Kanons/Gelobet_gelobet_sei_der_da_kommt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gloria_/Makefile b/Kanons/Gloria_/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Gloria_/Makefile +++ b/Kanons/Gloria_/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile b/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile +++ b/Kanons/Gottes_Wort_ist_wie_Licht_in_der_Nacht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile b/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile +++ b/Kanons/Hoffnung_die_dunkle_Nacht_erhellt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile b/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile +++ b/Kanons/Ich_will_den_Herrn_loben_allezeit/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Jahreslosung_2018/Makefile b/Kanons/Jahreslosung_2018/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Jahreslosung_2018/Makefile +++ b/Kanons/Jahreslosung_2018/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Kaffeeklatsch/Makefile b/Kanons/Kaffeeklatsch/Makefile index d77f888..cb66cc7 100644 --- a/Kanons/Kaffeeklatsch/Makefile +++ b/Kanons/Kaffeeklatsch/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile b/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile +++ b/Kanons/Komm_Herr_Jesu_sei_du_unser_Gast/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Kommt_das_Essen_ist_bereitet/Makefile b/Kanons/Kommt_das_Essen_ist_bereitet/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Kommt_das_Essen_ist_bereitet/Makefile +++ b/Kanons/Kommt_das_Essen_ist_bereitet/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Lobet_und_preiset/Makefile b/Kanons/Lobet_und_preiset/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Lobet_und_preiset/Makefile +++ b/Kanons/Lobet_und_preiset/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Mache_dich_auf_und_werde_Licht/Makefile b/Kanons/Mache_dich_auf_und_werde_Licht/Makefile index 300cdb2..cb66cc7 100644 --- a/Kanons/Mache_dich_auf_und_werde_Licht/Makefile +++ b/Kanons/Mache_dich_auf_und_werde_Licht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Segne_Herr_was_deine_Hand/Makefile b/Kanons/Segne_Herr_was_deine_Hand/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Segne_Herr_was_deine_Hand/Makefile +++ b/Kanons/Segne_Herr_was_deine_Hand/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Segne_Vater_diese_Speise/Makefile b/Kanons/Segne_Vater_diese_Speise/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Segne_Vater_diese_Speise/Makefile +++ b/Kanons/Segne_Vater_diese_Speise/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile b/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile index 157c845..cb66cc7 100644 --- a/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile +++ b/Kanons/Und_wie_der_kleine_Vogel_singt/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kasimirs_Liederbuch/Welche_Farbe_hat_die_Welt/Makefile b/Kasimirs_Liederbuch/Welche_Farbe_hat_die_Welt/Makefile index 40b59ae..cb66cc7 100644 --- a/Kasimirs_Liederbuch/Welche_Farbe_hat_die_Welt/Makefile +++ b/Kasimirs_Liederbuch/Welche_Farbe_hat_die_Welt/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[1-9]\|1[01] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Koenig_mild_vertreibt_die_Finsternis/Makefile b/Koenig_mild_vertreibt_die_Finsternis/Makefile index fec5612..cb66cc7 100644 --- a/Koenig_mild_vertreibt_die_Finsternis/Makefile +++ b/Koenig_mild_vertreibt_die_Finsternis/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Komm_Gott_Schoepfer_Heiliger_Geist/Makefile b/Komm_Gott_Schoepfer_Heiliger_Geist/Makefile index 1d86955..cb66cc7 100644 --- a/Komm_Gott_Schoepfer_Heiliger_Geist/Makefile +++ b/Komm_Gott_Schoepfer_Heiliger_Geist/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(UNTERSTIMMEN),1) - UNTERSTIMMEN_REGEX=s@%unterstimme%@@ -else - UNTERSTIMMEN_REGEX= -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,19 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(UNTERSTIMMEN_REGEX); \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Komm_Heilger_Geist/Makefile b/Komm_Heilger_Geist/Makefile index b7ad1bf..cb66cc7 100644 --- a/Komm_Heilger_Geist/Makefile +++ b/Komm_Heilger_Geist/Makefile @@ -1,20 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -UNTERSTIMMEN=1 -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(UNTERSTIMMEN),1) - UNTERSTIMMEN_REGEX=s@%unterstimme%@@ -else - UNTERSTIMMEN_REGEX= -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -25,20 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(UNTERSTIMMEN_REGEX); \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - s@%transpose%@$(TRANSPOSE)@g; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Komm_Heiliger_Geist/Makefile b/Komm_Heiliger_Geist/Makefile index 300cdb2..cb66cc7 100644 --- a/Komm_Heiliger_Geist/Makefile +++ b/Komm_Heiliger_Geist/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Komm_in_unsre_stolze_Welt/Makefile b/Komm_in_unsre_stolze_Welt/Makefile index 1b753e8..cb66cc7 100644 --- a/Komm_in_unsre_stolze_Welt/Makefile +++ b/Komm_in_unsre_stolze_Welt/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Komm_zu_uns_in_deinem_Wort/Makefile b/Komm_zu_uns_in_deinem_Wort/Makefile index 8f8fa34..cb66cc7 100644 --- a/Komm_zu_uns_in_deinem_Wort/Makefile +++ b/Komm_zu_uns_in_deinem_Wort/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,19 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - s/%Variante_$(VARIANTE)%//; \ - /%[A-Z_0-9]\+%/d ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre artikulation.ly satz.pre stimmen.pre texte.pre +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kommet_ihr_Hirten/Makefile b/Kommet_ihr_Hirten/Makefile index fec5612..cb66cc7 100644 --- a/Kommet_ihr_Hirten/Makefile +++ b/Kommet_ihr_Hirten/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kommt_herzu/Makefile b/Kommt_herzu/Makefile index 300cdb2..cb66cc7 100644 --- a/Kommt_herzu/Makefile +++ b/Kommt_herzu/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kommt_mit_Gaben_und_Lobgesang/Makefile b/Kommt_mit_Gaben_und_Lobgesang/Makefile index 29d8d9d..cb66cc7 100644 --- a/Kommt_mit_Gaben_und_Lobgesang/Makefile +++ b/Kommt_mit_Gaben_und_Lobgesang/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Korn_dass_in_die_Erde/Makefile b/Korn_dass_in_die_Erde/Makefile index 9a5f07f..cb66cc7 100644 --- a/Korn_dass_in_die_Erde/Makefile +++ b/Korn_dass_in_die_Erde/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Kyrie/Makefile b/Kyrie/Makefile index cd041e4..cb66cc7 100644 --- a/Kyrie/Makefile +++ b/Kyrie/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Laudate_omnes_gentes/Makefile b/Laudate_omnes_gentes/Makefile index 300cdb2..cb66cc7 100644 --- a/Laudate_omnes_gentes/Makefile +++ b/Laudate_omnes_gentes/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobe_den_Herren/Makefile b/Lobe_den_Herren/Makefile index cd041e4..cb66cc7 100644 --- a/Lobe_den_Herren/Makefile +++ b/Lobe_den_Herren/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobe_den_Herren_/Makefile b/Lobe_den_Herren_/Makefile index ade8dc0..cb66cc7 100644 --- a/Lobe_den_Herren_/Makefile +++ b/Lobe_den_Herren_/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobe_den_Herrn_meine_Seele/Makefile b/Lobe_den_Herrn_meine_Seele/Makefile index 300cdb2..cb66cc7 100644 --- a/Lobe_den_Herrn_meine_Seele/Makefile +++ b/Lobe_den_Herrn_meine_Seele/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobe_den_Herrn_meine_Seele_/Makefile b/Lobe_den_Herrn_meine_Seele_/Makefile index 300cdb2..cb66cc7 100644 --- a/Lobe_den_Herrn_meine_Seele_/Makefile +++ b/Lobe_den_Herrn_meine_Seele_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobet_den_Herren_alle/Makefile b/Lobet_den_Herren_alle/Makefile index cd041e4..cb66cc7 100644 --- a/Lobet_den_Herren_alle/Makefile +++ b/Lobet_den_Herren_alle/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobet_den_Herrn_und_dankt_ihm_seine_Gaben/Makefile b/Lobet_den_Herrn_und_dankt_ihm_seine_Gaben/Makefile index fec5612..cb66cc7 100644 --- a/Lobet_den_Herrn_und_dankt_ihm_seine_Gaben/Makefile +++ b/Lobet_den_Herrn_und_dankt_ihm_seine_Gaben/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Lobsinget_Gott_dem_Herrn/Makefile b/Lobsinget_Gott_dem_Herrn/Makefile index b49439c..cb66cc7 100644 --- a/Lobsinget_Gott_dem_Herrn/Makefile +++ b/Lobsinget_Gott_dem_Herrn/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@;$(KLAVIER_REGEX)" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Macht_hoch_die_Tuer/Makefile b/Macht_hoch_die_Tuer/Makefile index 932720d..cb66cc7 100644 --- a/Macht_hoch_die_Tuer/Makefile +++ b/Macht_hoch_die_Tuer/Makefile @@ -1,31 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -PAUSE_STATT_FERMATE=0 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - -ifeq ($(PAUSE_STATT_FERMATE),1) - FERMATEN_REGEX=/%fermate$$/ s/2\\([_^]\\?\\\\fermata\\)\\? /4 s /; -else - FERMATEN_REGEX=/%fermaten_pause$$/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -36,22 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - $(FERMATEN_REGEX) \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -stimmen.pre: stimmen.ly - sed " \ - $(FERMATEN_REGEX) \ - " "$<" > "$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Macht_hoch_die_Tuer_/Makefile b/Macht_hoch_die_Tuer_/Makefile index 300cdb2..cb66cc7 100644 --- a/Macht_hoch_die_Tuer_/Makefile +++ b/Macht_hoch_die_Tuer_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Magnificat/Makefile b/Magnificat/Makefile index 404faec..cb66cc7 100644 --- a/Magnificat/Makefile +++ b/Magnificat/Makefile @@ -1,19 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%//; -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -24,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - $(OBERSTIMMEN_REGEX) \ - s/%STR_\($(STROPHEN)\)%//; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Maria_durch_ein_Dornwald_ging/Makefile b/Maria_durch_ein_Dornwald_ging/Makefile index fec5612..cb66cc7 100644 --- a/Maria_durch_ein_Dornwald_ging/Makefile +++ b/Maria_durch_ein_Dornwald_ging/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Mein_Jesus_ich_lieb_dich/Makefile b/Mein_Jesus_ich_lieb_dich/Makefile index 300cdb2..cb66cc7 100644 --- a/Mein_Jesus_ich_lieb_dich/Makefile +++ b/Mein_Jesus_ich_lieb_dich/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Meine_Hoffnung_und_meine_Freude/Makefile b/Meine_Hoffnung_und_meine_Freude/Makefile index 300cdb2..cb66cc7 100644 --- a/Meine_Hoffnung_und_meine_Freude/Makefile +++ b/Meine_Hoffnung_und_meine_Freude/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Meine_Zeit/Makefile b/Meine_Zeit/Makefile index 300cdb2..cb66cc7 100644 --- a/Meine_Zeit/Makefile +++ b/Meine_Zeit/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Messias/Makefile b/Messias/Makefile index 07dc577..cb66cc7 100644 --- a/Messias/Makefile +++ b/Messias/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly parts/*.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Mir_ist_Erbarmung_widerfahren/Makefile b/Mir_ist_Erbarmung_widerfahren/Makefile index cd041e4..cb66cc7 100644 --- a/Mir_ist_Erbarmung_widerfahren/Makefile +++ b/Mir_ist_Erbarmung_widerfahren/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Missa_brevis/Makefile b/Missa_brevis/Makefile index d7fe0f3..cb66cc7 100644 --- a/Missa_brevis/Makefile +++ b/Missa_brevis/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Missa_brevis_in_C/Makefile b/Missa_brevis_in_C/Makefile index 892fabe..cb66cc7 100644 --- a/Missa_brevis_in_C/Makefile +++ b/Missa_brevis_in_C/Makefile @@ -1,14 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -.PHONY: all clean Clean $(SUBDIRS) - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -18,8 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Missa_in_C/Makefile b/Missa_in_C/Makefile index d7fe0f3..cb66cc7 100644 --- a/Missa_in_C/Makefile +++ b/Missa_in_C/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Moegen_sich_die_Wege_vor_deinen_Fueszen_ebnen/Makefile b/Moegen_sich_die_Wege_vor_deinen_Fueszen_ebnen/Makefile index 300cdb2..cb66cc7 100644 --- a/Moegen_sich_die_Wege_vor_deinen_Fueszen_ebnen/Makefile +++ b/Moegen_sich_die_Wege_vor_deinen_Fueszen_ebnen/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Morgenlicht_leuchtet/Makefile b/Morgenlicht_leuchtet/Makefile index 29d8d9d..cb66cc7 100644 --- a/Morgenlicht_leuchtet/Makefile +++ b/Morgenlicht_leuchtet/Makefile @@ -1,12 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -17,18 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Naeher_mein_Gott_zu_dir/Makefile b/Naeher_mein_Gott_zu_dir/Makefile index 300cdb2..cb66cc7 100644 --- a/Naeher_mein_Gott_zu_dir/Makefile +++ b/Naeher_mein_Gott_zu_dir/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nicht_der_Anfang_nur_das_Ende/Makefile b/Nicht_der_Anfang_nur_das_Ende/Makefile index cd041e4..cb66cc7 100644 --- a/Nicht_der_Anfang_nur_das_Ende/Makefile +++ b/Nicht_der_Anfang_nur_das_Ende/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Noch_dringt_Jesu_frohe_Botschaft/Makefile b/Noch_dringt_Jesu_frohe_Botschaft/Makefile index cd041e4..cb66cc7 100644 --- a/Noch_dringt_Jesu_frohe_Botschaft/Makefile +++ b/Noch_dringt_Jesu_frohe_Botschaft/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_bitten_wir_den_Heiligen_Geist/Makefile b/Nun_bitten_wir_den_Heiligen_Geist/Makefile index 0ebc53f..cb66cc7 100644 --- a/Nun_bitten_wir_den_Heiligen_Geist/Makefile +++ b/Nun_bitten_wir_den_Heiligen_Geist/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_danket_alle_Gott/Makefile b/Nun_danket_alle_Gott/Makefile index fec5612..cb66cc7 100644 --- a/Nun_danket_alle_Gott/Makefile +++ b/Nun_danket_alle_Gott/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_danket_alle_Gott_/Makefile b/Nun_danket_alle_Gott_/Makefile index fec5612..cb66cc7 100644 --- a/Nun_danket_alle_Gott_/Makefile +++ b/Nun_danket_alle_Gott_/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_danket_alle_Gott__/Makefile b/Nun_danket_alle_Gott__/Makefile index 20dce3b..cb66cc7 100644 --- a/Nun_danket_alle_Gott__/Makefile +++ b/Nun_danket_alle_Gott__/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -TRANSPOSE=c - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,17 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_komm_der_Heiden_Heiland_/Makefile b/Nun_komm_der_Heiden_Heiland_/Makefile index 07dc577..cb66cc7 100644 --- a/Nun_komm_der_Heiden_Heiland_/Makefile +++ b/Nun_komm_der_Heiden_Heiland_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly parts/*.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_lasst_uns_Gott_dem_Herren_Dank_sagen/Makefile b/Nun_lasst_uns_Gott_dem_Herren_Dank_sagen/Makefile index fec5612..cb66cc7 100644 --- a/Nun_lasst_uns_Gott_dem_Herren_Dank_sagen/Makefile +++ b/Nun_lasst_uns_Gott_dem_Herren_Dank_sagen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Nun_ruhen_alle_Waelder/Makefile b/Nun_ruhen_alle_Waelder/Makefile index 300cdb2..cb66cc7 100644 --- a/Nun_ruhen_alle_Waelder/Makefile +++ b/Nun_ruhen_alle_Waelder/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_Haupt_voll_Blut_und_Wunden/Makefile b/O_Haupt_voll_Blut_und_Wunden/Makefile index f86b876..cb66cc7 100644 --- a/O_Haupt_voll_Blut_und_Wunden/Makefile +++ b/O_Haupt_voll_Blut_und_Wunden/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_Heiland_reisz_die_Himmel_auf/Makefile b/O_Heiland_reisz_die_Himmel_auf/Makefile index fec5612..cb66cc7 100644 --- a/O_Heiland_reisz_die_Himmel_auf/Makefile +++ b/O_Heiland_reisz_die_Himmel_auf/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_Jesu_Christe_wahres_Licht/Makefile b/O_Jesu_Christe_wahres_Licht/Makefile index 300cdb2..cb66cc7 100644 --- a/O_Jesu_Christe_wahres_Licht/Makefile +++ b/O_Jesu_Christe_wahres_Licht/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_du_froehliche/Makefile b/O_du_froehliche/Makefile index ffc635a..cb66cc7 100644 --- a/O_du_froehliche/Makefile +++ b/O_du_froehliche/Makefile @@ -1,25 +1,6 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX=s/%Klavier%// -else - KLAVIER_REGEX=/%Klavier%/d; -endif - -ifeq ($(OBERSTIMME),1) - OBERSTIMMEN_REGEX=s/%Oberstimme%// -else - OBERSTIMMEN_REGEX=/%Oberstimme%/d; -endif - -all: $(CURDOC).pdf $(CURDOC).midi +all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true clean: @@ -28,13 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(OBERSTIMMEN_REGEX); \ - $(KLAVIER_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf %.midi: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_du_stille_Zeit/Makefile b/O_du_stille_Zeit/Makefile index cd041e4..cb66cc7 100644 --- a/O_du_stille_Zeit/Makefile +++ b/O_du_stille_Zeit/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/O_komm_du_Geist_der_Wahrheit/Makefile b/O_komm_du_Geist_der_Wahrheit/Makefile index 1d86955..cb66cc7 100644 --- a/O_komm_du_Geist_der_Wahrheit/Makefile +++ b/O_komm_du_Geist_der_Wahrheit/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(UNTERSTIMMEN),1) - UNTERSTIMMEN_REGEX=s@%unterstimme%@@ -else - UNTERSTIMMEN_REGEX= -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,19 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(UNTERSTIMMEN_REGEX); \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Oeffne_den_Weg/Makefile b/Oeffne_den_Weg/Makefile index 300cdb2..cb66cc7 100644 --- a/Oeffne_den_Weg/Makefile +++ b/Oeffne_den_Weg/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Pachelbels_Kanon_des_Friedens/Makefile b/Pachelbels_Kanon_des_Friedens/Makefile index 300cdb2..cb66cc7 100644 --- a/Pachelbels_Kanon_des_Friedens/Makefile +++ b/Pachelbels_Kanon_des_Friedens/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Pop_Messe/Makefile b/Pop_Messe/Makefile index 892fabe..cb66cc7 100644 --- a/Pop_Messe/Makefile +++ b/Pop_Messe/Makefile @@ -1,14 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -.PHONY: all clean Clean $(SUBDIRS) - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -18,8 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ronja_Raeubertochter/Makefile b/Ronja_Raeubertochter/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ronja_Raeubertochter/Makefile +++ b/Ronja_Raeubertochter/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile b/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile index 9a5f07f..cb66cc7 100644 --- a/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile +++ b/Saalburg_du_Perle_am_schoenen_Saalestrand/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Schalom/Makefile b/Schalom/Makefile index 9a5f07f..cb66cc7 100644 --- a/Schalom/Makefile +++ b/Schalom/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Schmueckt_das_Fest_mit_Maien/Makefile b/Schmueckt_das_Fest_mit_Maien/Makefile index 90faa64..cb66cc7 100644 --- a/Schmueckt_das_Fest_mit_Maien/Makefile +++ b/Schmueckt_das_Fest_mit_Maien/Makefile @@ -14,8 +14,9 @@ include ../.meta/*.mk %.pre: %.ly cat "$<" > "$@" -%.post: %.pre +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) m4 <"$<" >"$@" -%.pdf: %.post $(patsubst %.ly,%.post, $(shell ls *.ly)) +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Schoen_ist_die_Erde/Makefile b/Schoen_ist_die_Erde/Makefile index 300cdb2..cb66cc7 100644 --- a/Schoen_ist_die_Erde/Makefile +++ b/Schoen_ist_die_Erde/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Sein_Kleid_fuer_meins/Makefile b/Sein_Kleid_fuer_meins/Makefile index 300cdb2..cb66cc7 100644 --- a/Sein_Kleid_fuer_meins/Makefile +++ b/Sein_Kleid_fuer_meins/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Selig_seid_ihr/Makefile b/Selig_seid_ihr/Makefile index 300cdb2..cb66cc7 100644 --- a/Selig_seid_ihr/Makefile +++ b/Selig_seid_ihr/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Shalom_aleichem/Makefile b/Shalom_aleichem/Makefile index 300cdb2..cb66cc7 100644 --- a/Shalom_aleichem/Makefile +++ b/Shalom_aleichem/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Singet_dem_Herrn_ein_neues_Lied/Makefile b/Singet_dem_Herrn_ein_neues_Lied/Makefile index 300cdb2..cb66cc7 100644 --- a/Singet_dem_Herrn_ein_neues_Lied/Makefile +++ b/Singet_dem_Herrn_ein_neues_Lied/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Singet_froh/Makefile b/Singet_froh/Makefile index 300cdb2..cb66cc7 100644 --- a/Singet_froh/Makefile +++ b/Singet_froh/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Sommerpsalm/Makefile b/Sommerpsalm/Makefile index 300cdb2..cb66cc7 100644 --- a/Sommerpsalm/Makefile +++ b/Sommerpsalm/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Sprichst_du_dein_Vaterunser/Makefile b/Sprichst_du_dein_Vaterunser/Makefile index 300cdb2..cb66cc7 100644 --- a/Sprichst_du_dein_Vaterunser/Makefile +++ b/Sprichst_du_dein_Vaterunser/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Stern_ueber_Bethlehem/Makefile b/Stern_ueber_Bethlehem/Makefile index fec5612..cb66cc7 100644 --- a/Stern_ueber_Bethlehem/Makefile +++ b/Stern_ueber_Bethlehem/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Stern_ueber_Bethlehem_/Makefile b/Stern_ueber_Bethlehem_/Makefile index fec5612..cb66cc7 100644 --- a/Stern_ueber_Bethlehem_/Makefile +++ b/Stern_ueber_Bethlehem_/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Still/Makefile b/Still/Makefile index 1b753e8..cb66cc7 100644 --- a/Still/Makefile +++ b/Still/Makefile @@ -1,23 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Stups_der_kleine_Osterhase/Makefile b/Stups_der_kleine_Osterhase/Makefile index 9a5f07f..cb66cc7 100644 --- a/Stups_der_kleine_Osterhase/Makefile +++ b/Stups_der_kleine_Osterhase/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Tanzen_und_Springen/Makefile b/Tanzen_und_Springen/Makefile index 300cdb2..cb66cc7 100644 --- a/Tanzen_und_Springen/Makefile +++ b/Tanzen_und_Springen/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Thank_you_for_the_music/Makefile b/Thank_you_for_the_music/Makefile index 9dcdc6c..cb66cc7 100644 --- a/Thank_you_for_the_music/Makefile +++ b/Thank_you_for_the_music/Makefile @@ -4,7 +4,7 @@ all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true clean: - rm -f *.pre *.post + rm -f *.pre Clean: clean rm -f *.pdf *.midi @@ -19,9 +19,4 @@ include ../.meta/*.mk %.pdf: %.post lilypond $< - -%.midi: %-nur-midi.post - lilypond $< - -test: - echo $(patsubst %.ly,%.post, $(shell ls *.ly)) + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/The_armed_man/Makefile b/The_armed_man/Makefile index d7fe0f3..cb66cc7 100644 --- a/The_armed_man/Makefile +++ b/The_armed_man/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/The_blessing_of_Aaron/Makefile b/The_blessing_of_Aaron/Makefile index cd041e4..cb66cc7 100644 --- a/The_blessing_of_Aaron/Makefile +++ b/The_blessing_of_Aaron/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Tochter_Zion/Makefile b/Tochter_Zion/Makefile index fec5612..cb66cc7 100644 --- a/Tochter_Zion/Makefile +++ b/Tochter_Zion/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Tretet_her_zum_Tisch_des_Herrn/Makefile b/Tretet_her_zum_Tisch_des_Herrn/Makefile index f86b876..cb66cc7 100644 --- a/Tretet_her_zum_Tisch_des_Herrn/Makefile +++ b/Tretet_her_zum_Tisch_des_Herrn/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - #\#(set-global-staff-size 19.5) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Troestet_mein_Volk/Makefile b/Troestet_mein_Volk/Makefile index 300cdb2..cb66cc7 100644 --- a/Troestet_mein_Volk/Makefile +++ b/Troestet_mein_Volk/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Ueber_dir_wach_ein_Engel/Makefile b/Ueber_dir_wach_ein_Engel/Makefile index 9a5f07f..cb66cc7 100644 --- a/Ueber_dir_wach_ein_Engel/Makefile +++ b/Ueber_dir_wach_ein_Engel/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Uebers_Gebirg_Maria_geht/Makefile b/Uebers_Gebirg_Maria_geht/Makefile index fec5612..cb66cc7 100644 --- a/Uebers_Gebirg_Maria_geht/Makefile +++ b/Uebers_Gebirg_Maria_geht/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Uns_ist_ein_Kind_geboren/Makefile b/Uns_ist_ein_Kind_geboren/Makefile index d7fe0f3..cb66cc7 100644 --- a/Uns_ist_ein_Kind_geboren/Makefile +++ b/Uns_ist_ein_Kind_geboren/Makefile @@ -1,18 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; } -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -22,11 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly parts/*.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Unser_Vater/Makefile b/Unser_Vater/Makefile index fec5612..cb66cc7 100644 --- a/Unser_Vater/Makefile +++ b/Unser_Vater/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Unser_Vater_/Makefile b/Unser_Vater_/Makefile index fec5612..cb66cc7 100644 --- a/Unser_Vater_/Makefile +++ b/Unser_Vater_/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Veni_Creator_Spiritus/Makefile b/Veni_Creator_Spiritus/Makefile index 9afd104..cb66cc7 100644 --- a/Veni_Creator_Spiritus/Makefile +++ b/Veni_Creator_Spiritus/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -27,22 +7,16 @@ clean: rm -f *.pre Clean: clean - rm -f $(CURDOC)*.pdf $(CURDOC)*.midi + rm -f *.pdf *.midi + +include ../.meta/*.mk -$(CURDOC).pre: $(CURDOC).ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - " "$<" > "$@" +%.pre: %.ly + cat "$<" > "$@" -%.pre: %.ly parse-str-comments - ./parse-str-comments 7 "$(STROPHEN)" < "$<" > "$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.pre +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Verleih_uns_Frieden/Makefile b/Verleih_uns_Frieden/Makefile index 9a5f07f..cb66cc7 100644 --- a/Verleih_uns_Frieden/Makefile +++ b/Verleih_uns_Frieden/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Verleih_uns_Frieden_/Makefile b/Verleih_uns_Frieden_/Makefile index 300cdb2..cb66cc7 100644 --- a/Verleih_uns_Frieden_/Makefile +++ b/Verleih_uns_Frieden_/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Verleih_uns_Frieden__/Makefile b/Verleih_uns_Frieden__/Makefile index 9a5f07f..cb66cc7 100644 --- a/Verleih_uns_Frieden__/Makefile +++ b/Verleih_uns_Frieden__/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Vertraut_den_neuen_Wegen/Makefile b/Vertraut_den_neuen_Wegen/Makefile index 9a5f07f..cb66cc7 100644 --- a/Vertraut_den_neuen_Wegen/Makefile +++ b/Vertraut_den_neuen_Wegen/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Viele_verachten_die_edele_Musik/Makefile b/Viele_verachten_die_edele_Musik/Makefile index cd041e4..cb66cc7 100644 --- a/Viele_verachten_die_edele_Musik/Makefile +++ b/Viele_verachten_die_edele_Musik/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Vinum_schenk_ein/Makefile b/Vinum_schenk_ein/Makefile index 300cdb2..cb66cc7 100644 --- a/Vinum_schenk_ein/Makefile +++ b/Vinum_schenk_ein/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Vom_Himmel_hoch_da_komm_ich_her/Makefile b/Vom_Himmel_hoch_da_komm_ich_her/Makefile index 300cdb2..cb66cc7 100644 --- a/Vom_Himmel_hoch_da_komm_ich_her/Makefile +++ b/Vom_Himmel_hoch_da_komm_ich_her/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Vom_Himmel_kam_der_Engel_Schar/Makefile b/Vom_Himmel_kam_der_Engel_Schar/Makefile index 07dc577..cb66cc7 100644 --- a/Vom_Himmel_kam_der_Engel_Schar/Makefile +++ b/Vom_Himmel_kam_der_Engel_Schar/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly parts/*.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Von_guten_Maechten/Makefile b/Von_guten_Maechten/Makefile index f90ee14..cb66cc7 100644 --- a/Von_guten_Maechten/Makefile +++ b/Von_guten_Maechten/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre satz.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wachet_auf_ruft_uns_die_Stimme/Makefile b/Wachet_auf_ruft_uns_die_Stimme/Makefile index 511d4c6..cb66cc7 100644 --- a/Wachet_auf_ruft_uns_die_Stimme/Makefile +++ b/Wachet_auf_ruft_uns_die_Stimme/Makefile @@ -1,32 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 -FERMATEN=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - -ifeq ($(FERMATEN),0) - FERMATEN_REGEX=s@[_^]\\fermata@@; -else - FERMATEN_REGEX= -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -37,15 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - $(FERMATEN_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Was_noch_frisch_und_jung_an_Jahren/Makefile b/Was_noch_frisch_und_jung_an_Jahren/Makefile index 9a5f07f..cb66cc7 100644 --- a/Was_noch_frisch_und_jung_an_Jahren/Makefile +++ b/Was_noch_frisch_und_jung_an_Jahren/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Weihnachtsmotette/Makefile b/Weihnachtsmotette/Makefile index fec5612..cb66cc7 100644 --- a/Weihnachtsmotette/Makefile +++ b/Weihnachtsmotette/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Weil_Gott_in_tiefster_Nacht_erschienen/Makefile b/Weil_Gott_in_tiefster_Nacht_erschienen/Makefile index 300cdb2..cb66cc7 100644 --- a/Weil_Gott_in_tiefster_Nacht_erschienen/Makefile +++ b/Weil_Gott_in_tiefster_Nacht_erschienen/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Weil_ich_Jesu_Schaeflein_bin/Makefile b/Weil_ich_Jesu_Schaeflein_bin/Makefile index 80b076a..cb66cc7 100644 --- a/Weil_ich_Jesu_Schaeflein_bin/Makefile +++ b/Weil_ich_Jesu_Schaeflein_bin/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre satz.pre stimmen.pre texte.pre +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Weiszt_du_wieviel_Sternlein_stehen/Makefile b/Weiszt_du_wieviel_Sternlein_stehen/Makefile index 653be3f..cb66cc7 100644 --- a/Weiszt_du_wieviel_Sternlein_stehen/Makefile +++ b/Weiszt_du_wieviel_Sternlein_stehen/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Welch_ein_Freund_ist_unser_Jesus/Makefile b/Welch_ein_Freund_ist_unser_Jesus/Makefile index cd041e4..cb66cc7 100644 --- a/Welch_ein_Freund_ist_unser_Jesus/Makefile +++ b/Welch_ein_Freund_ist_unser_Jesus/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wenn_Mozart_nicht_gestorben_waer/Makefile b/Wenn_Mozart_nicht_gestorben_waer/Makefile index 300cdb2..cb66cc7 100644 --- a/Wenn_Mozart_nicht_gestorben_waer/Makefile +++ b/Wenn_Mozart_nicht_gestorben_waer/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wer_bis_an_das_Ende_beharrt/Makefile b/Wer_bis_an_das_Ende_beharrt/Makefile index 300cdb2..cb66cc7 100644 --- a/Wer_bis_an_das_Ende_beharrt/Makefile +++ b/Wer_bis_an_das_Ende_beharrt/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wer_kann_segeln/Makefile b/Wer_kann_segeln/Makefile index 300cdb2..cb66cc7 100644 --- a/Wer_kann_segeln/Makefile +++ b/Wer_kann_segeln/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wie_lieb_sind_mir_deine_Wohnungen/Makefile b/Wie_lieb_sind_mir_deine_Wohnungen/Makefile index 0b6245d..cb66cc7 100644 --- a/Wie_lieb_sind_mir_deine_Wohnungen/Makefile +++ b/Wie_lieb_sind_mir_deine_Wohnungen/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wie_lieblich_ist_der_Maien/Makefile b/Wie_lieblich_ist_der_Maien/Makefile index cd041e4..cb66cc7 100644 --- a/Wie_lieblich_ist_der_Maien/Makefile +++ b/Wie_lieblich_ist_der_Maien/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wie_lieblich_ist_der_Maien_/Makefile b/Wie_lieblich_ist_der_Maien_/Makefile index cd041e4..cb66cc7 100644 --- a/Wie_lieblich_ist_der_Maien_/Makefile +++ b/Wie_lieblich_ist_der_Maien_/Makefile @@ -1,24 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -28,12 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wie_soll_ich_dich_empfangen/Makefile b/Wie_soll_ich_dich_empfangen/Makefile index 300cdb2..cb66cc7 100644 --- a/Wie_soll_ich_dich_empfangen/Makefile +++ b/Wie_soll_ich_dich_empfangen/Makefile @@ -1,12 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -16,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wir_danken_Gott_fuer_seine_Gaben/Makefile b/Wir_danken_Gott_fuer_seine_Gaben/Makefile index fec5612..cb66cc7 100644 --- a/Wir_danken_Gott_fuer_seine_Gaben/Makefile +++ b/Wir_danken_Gott_fuer_seine_Gaben/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wir_danken_dir_Herr_Jesu_Christ/Makefile b/Wir_danken_dir_Herr_Jesu_Christ/Makefile index fec5612..cb66cc7 100644 --- a/Wir_danken_dir_Herr_Jesu_Christ/Makefile +++ b/Wir_danken_dir_Herr_Jesu_Christ/Makefile @@ -1,24 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -29,16 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - /%STR_\($(STROPHEN)\)%/{ \ - s/%[A-Z_0-9]\+%//; \ - p; \ - d; \ - }; \ - /%[A-Z_0-9]\+%/d \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre *.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wir_wuenschen_Gottes_Segen/Makefile b/Wir_wuenschen_Gottes_Segen/Makefile index 0b6245d..cb66cc7 100644 --- a/Wir_wuenschen_Gottes_Segen/Makefile +++ b/Wir_wuenschen_Gottes_Segen/Makefile @@ -1,25 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -TRANSPOSE=c -VARIANTE=1 - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -30,14 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - s@%TRANSPOSE%@$(TRANSPOSE)@g; \ - s@%Variante_$(VARIANTE)%@@g; \ - " "$<" > "$@" + cat "$<" > "$@" + +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.pre stimmen.pre texte.ly +%.pdf: %.post lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile b/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile index 9a5f07f..cb66cc7 100644 --- a/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile +++ b/Wir_wuenschen_dass_jedes_Kind_auf_der_Welt_lachen_kann/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/Yesterday/Makefile b/Yesterday/Makefile index 9a5f07f..cb66cc7 100644 --- a/Yesterday/Makefile +++ b/Yesterday/Makefile @@ -1,18 +1,4 @@ CURDOC=$(shell basename "$(CURDIR)") -STROPHEN=[^%] -VARIANTE=1 - -ifeq ($(MIDI),1) - MIDI_REGEX= -else - MIDI_REGEX=/\\\\midi/{ :a; s/\\\\midi[^{}]*{/\\\\midi/; tb; N; ba; :b; s/{[^{}]*}//; tb; s/\\\\midi[^{}]*}//; t; N; bb; }; -endif - -ifeq ($(KLAVIER),1) - KLAVIER_REGEX= -else - KLAVIER_REGEX=/%Klavier%/d; -endif all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -23,25 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi -%.pre: %.ly - sed " \ - s@%spezifisch%@$(SPEZIFISCH)@ ; \ - s/%STR_\($(STROPHEN)\)%//g; \ - s/%Variante_$(VARIANTE)%//; \ - $(KLAVIER_REGEX) \ - $(MIDI_REGEX) \ - " "$<" > "$@" +include ../.meta/*.mk -$(CURDOC).meta: $(CURDOC)-plain.meta - cat "$<" >"$@" +%.pre: %.ly + cat "$<" > "$@" -$(CURDOC)-%.meta: ../.meta/%.meta $(CURDOC).pre - sed " \ - 1 i define(input,$(CURDOC).pre) \ - " "$<" \ - | m4 \ - >"$@" +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" -%.pdf: %.meta stimmen.pre texte.pre +%.pdf: %.post lilypond $< pkill -SIGHUP -xf "mupdf $@" || true diff --git a/wo/Makefile b/wo/Makefile index 7f57d8b..cb66cc7 100644 --- a/wo/Makefile +++ b/wo/Makefile @@ -1,11 +1,5 @@ CURDOC=$(shell basename "$(CURDIR)") -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH=\#(set-global-staff-size 14) -endif - all: $(CURDOC).pdf pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true @@ -15,9 +9,14 @@ clean: Clean: clean rm -f *.pdf *.midi +include ../.meta/*.mk + %.pre: %.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + cat "$<" > "$@" -%.pdf: %.pre *.ly parts/*.ly - lilypond $< +%.post: %.pre $(patsubst %.ly,%.pre, $(shell ls *.ly)) + m4 <"$<" >"$@" +%.pdf: %.post + lilypond $< + pkill -SIGHUP -xf "mupdf $@" || true -- cgit v1.2.3-54-g00ecf