diff options
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | dynamic.mk | 24 | ||||
| -rw-r--r-- | music/choro-da-saudade.ly | 6 | ||||
| -rw-r--r-- | music/common.ly.include (renamed from music/common.ly) | 0 | ||||
| -rw-r--r-- | music/dengoso.ly | 6 | ||||
| -rw-r--r-- | music/guitar.ly.include (renamed from music/guitar.ly) | 0 | ||||
| -rw-r--r-- | music/marcha-dos-marinheiros.ly | 6 | ||||
| -rwxr-xr-x | src/development/dynmake.sh | 30 |
8 files changed, 56 insertions, 49 deletions
@@ -2,42 +2,21 @@ FQDN = euandre.org .SUFFIXES: -.SUFFIXES: .ly .flac .midi .ogg .pdf - -.ly.midi: - lilypond -o $* $< - -.midi.ogg: - timidity -Ov $< +.SUFFIXES: .flac .ogg .flac.ogg: ffmpeg -y -i $< -ar 48000 -vn -c:a libvorbis -b:a 320k $@ -lilypond.ly = \ - music/choro-da-saudade.ly \ - music/dengoso.ly \ - music/marcha-dos-marinheiros.ly -lilypond.pdf = $(lilypond.ly:.ly=.pdf) -lilypond.midi = $(lilypond.ly:.ly=.midi) -lilypond.ogg = $(lilypond.midi:.midi=.ogg) -lilypond = \ - $(lilypond.pdf) \ - $(lilypond.midi) \ - $(lilypond.ogg) - favicons = static/lord-favicon.png static/lord-favicon.ico favicon.ico derived-assets = \ - $(pastebins) \ - $(lilypond) \ $(favicons) \ - $(podcasts.ogg) \ TODOs.html \ -all: public dynamic +all: public dynamic: generated.mk $(MAKE) -f dynamic.mk all @@ -52,8 +31,6 @@ JEKYLL_COMPAT: # always considered stale. ALWAYS: -$(lilypond.pdf): $(lilypond.midi) - static/lord-favicon.png: static/lord-favicon.svg inkscape -o $@ -w 2048 -h 2048 -b white static/lord-favicon.svg @@ -79,14 +56,16 @@ check: dev-check: check clean: + $(MAKE) -f dynamic.mk clean rm -rf \ public/ .jekyll-cache \ $(derived-assets) \ - src/content/ generated.mk \ + src/content/ + # rm -f generated.mk JEKYLL = JEKYLL_ENV=production jekyll -public: $(derived-assets) +public: $(derived-assets) dynamic $(JEKYLL) build run: all @@ -1,7 +1,7 @@ .POSIX: .SUFFIXES: -.SUFFIXES: .md .env .html +.SUFFIXES: .md .env .html .ly .flac .midi .ogg .pdf .md.env: sh src/development/frontmatter-env.sh < $< > $@ @@ -9,14 +9,34 @@ .md.html: sh src/development/genhtml.sh $< > $@ +.ly.midi: + lilypond -o $* $< + +.midi.ogg: + timidity -Ov $< + include generated.mk pastebins.env = $(pastebins.md:.md=.env) pastebins.html = $(pastebins.md:.md=.html) +pastebins = $(pastebins.env) $(pastebins.html) -all: $(pastebins.env) $(pastebins.html) $(torrent-files) +lilypond.pdf = $(lilypond.ly:.ly=.pdf) +lilypond.midi = $(lilypond.ly:.ly=.midi) +lilypond.ogg = $(lilypond.ly:.ly=.ogg) +lilypond = $(lilypond.pdf) $(lilypond.midi) $(lilypond.ogg) + +ALL = \ + $(pastebins) \ + $(lilypond) \ + $(torrent-files) +all: $(ALL) $(torrent-files): mktorrent -f -v -d -n $@ -o $@ -c '' "$(@D)/`basename $@ .torrent`" + +clean: + rm -f \ + $(ALL) diff --git a/music/choro-da-saudade.ly b/music/choro-da-saudade.ly index f8fe7ff..2f6e686 100644 --- a/music/choro-da-saudade.ly +++ b/music/choro-da-saudade.ly @@ -2,8 +2,8 @@ \pointAndClickOff #(ly:set-option 'embed-source-code #t) -\include "common.ly" -\include "guitar.ly" +\include "common.ly.include" +\include "guitar.ly.include" \header { title = "Choro da Saudade" @@ -230,4 +230,4 @@ staff = \new Staff << \score { \unfoldRepeats \staff \midi { } -}
\ No newline at end of file +} diff --git a/music/common.ly b/music/common.ly.include index b6ba93a..b6ba93a 100644 --- a/music/common.ly +++ b/music/common.ly.include diff --git a/music/dengoso.ly b/music/dengoso.ly index e771bd4..b5a3fae 100644 --- a/music/dengoso.ly +++ b/music/dengoso.ly @@ -2,8 +2,8 @@ \pointAndClickOff #(ly:set-option 'embed-source-code #t) -\include "common.ly" -\include "guitar.ly" +\include "common.ly.include" +\include "guitar.ly.include" \header { title = "Dengoso" @@ -307,4 +307,4 @@ staff = \new Staff << \score { \unfoldRepeats \staff \midi { } -}
\ No newline at end of file +} diff --git a/music/guitar.ly b/music/guitar.ly.include index 592ad5c..592ad5c 100644 --- a/music/guitar.ly +++ b/music/guitar.ly.include diff --git a/music/marcha-dos-marinheiros.ly b/music/marcha-dos-marinheiros.ly index 66830f4..48cc1c6 100644 --- a/music/marcha-dos-marinheiros.ly +++ b/music/marcha-dos-marinheiros.ly @@ -2,8 +2,8 @@ \pointAndClickOff #(ly:set-option 'embed-source-code #t) -\include "common.ly" -\include "guitar.ly" +\include "common.ly.include" +\include "guitar.ly.include" \header { title = "Marcha dos Marinheiros" @@ -75,4 +75,4 @@ staff = \new Staff << \score { \unfoldRepeats \staff \midi { } -}
\ No newline at end of file +} diff --git a/src/development/dynmake.sh b/src/development/dynmake.sh index 9b74a9f..15251e7 100755 --- a/src/development/dynmake.sh +++ b/src/development/dynmake.sh @@ -66,17 +66,14 @@ varlist() { # pastebins() { - find src/content/pastebin -name '*.md' + find src/content/pastebin/ -name '*.md' } printf 'pastebins.md = \\\n' -pastebins | - varlist - +pastebins | varlist printf '\n' -pastebins | - sed 's/^\(.*\)\.md$/\1.html: \1.env/' +pastebins | sed 's/^\(.*\)\.md$/\1.html: \1.env/' @@ -85,18 +82,29 @@ pastebins | # torrents() { - find resources \ + find resources/ \ -name '*.flac' -or \ -name '*.ogg' -or \ -name '*.webm' } printf 'torrent-files = \\\n' +torrents | sed 's|$|.torrent|' | varlist +printf '\n' + +torrents | awk '{ printf "%s.torrent: %s\n", $0, $0 }' + -torrents | - sed 's|$|.torrent|' | - varlist +# +# Lilypond files +# +lilyponds() { + find music/ -name '*.ly' +} + +printf 'lilypond.ly = \\\n' +lilyponds | varlist printf '\n' -torrents | awk '{ printf "%s.torrent: %s\n", $0, $0 }' +lilyponds | sed 's/^\(.*\)\.ly$/\1.pdf: \1.midi/' |