X-Git-Url: https://git.distorted.org.uk/~mdw/epls/blobdiff_plain/5ea3eefa2167cf451e0b18e5f88edd28b8d88ff9..96ee145b3a2de7b765a73cbd2804ab6ceeea2d62:/Makefile diff --git a/Makefile b/Makefile index a7679ce..4ef28b5 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ $(call declare-filter, legends-of-tomorrow, arrowverse,lot, L/Legends of Tomorro $(call declare-filter, batwoman, arrowverse,bwm, B/Batwoman) $(call declare-filter, black-lightning, arrowverse,blt, B/Black Lightning) $(call declare-filter, stargirl, arrowverse,stg, S/Stargirl) +$(call declare-filter, superman-and-lois, arrowverse,sal, S/Superman & Lois) $(call declare-playlist, a-team, A/The A-Team) $(call declare-playlist, the-americans, A/The Americans) $(call declare-playlist, allo-allo, A/'Allo 'Allo!) @@ -97,26 +98,31 @@ $(call declare-playlist, danger-mouse, D/Danger Mouse) $(call declare-playlist, dark-angel, D/Dark Angel) $(call declare-playlist, the-day-today, D/The Day Today) $(call declare-playlist, dexter, D/Dexter) -$(call declare-playlist, drwho-marco-polo, D/Doctor Who/S01E04 D. Marco Polo) -$(call declare-playlist, drwho-crusade, D/Doctor Who/S02E06 P. The Crusade) -$(call declare-playlist, drwho-masterplan, D/Doctor Who/S03E04 V. The Daleks' Master Plan) #' -$(call declare-playlist, drwho-massacre, D/Doctor Who/S03E05 W. The Massacre of St Bartholomew's Eve) #' -$(call declare-playlist, drwho-toymaker, D/Doctor Who/S03E07 Y. The Celestial Toymaker) -$(call declare-playlist, drwho-savages, D/Doctor Who/S03E09 AA. The Savages) -$(call declare-playlist, drwho-smugglers, D/Doctor Who/S04E01 CC. The Smugglers) -$(call declare-playlist, drwho-highlanders, D/Doctor Who/S04E04 FF. The Highlanders) -$(call declare-playlist, drwho-snowmen, D/Doctor Who/S05E02 NN. The Abominable Snowmen) -$(call declare-playlist, drwho-wheel, D/Doctor Who/S05E07 SS. The Wheel in Space) -$(call declare-playlist, drwho-invasion, D/Doctor Who/S06E03 VV. The Invasion) -$(call declare-playlist, drwho-pirates, D/Doctor Who/S06E06 YY. The Space Pirates) -$(call declare-playlist, drwho-war-games, D/Doctor Who/S06E07 ZZ. The War Games) -$(call declare-playlist, drwho-silurians, D/Doctor Who/S07E02 BBB. Doctor Who and the Silurians) +$(call declare-playlist, drwho, D/Doctor Who) +$(call declare-filter, drwho-marco-polo, drwho,marco-polo, D/Doctor Who/S01E04 D. Marco Polo) +$(call declare-filter, drwho-crusade, drwho,crusade, D/Doctor Who/S02E06 P. The Crusade) +$(call declare-filter, drwho-myth-makers, drwho,myth-makers, D/Doctor Who/S03E03 U. The Myth Makers) +$(call declare-filter, drwho-masterplan, drwho,daleks-masterplan, D/Doctor Who/S03E04 V. The Daleks' Master Plan) #' +$(call declare-filter, drwho-massacre, drwho,massacre, D/Doctor Who/S03E05 W. The Massacre of St Bartholomew's Eve) #' +$(call declare-filter, drwho-toymaker, drwho,toymaker, D/Doctor Who/S03E07 Y. The Celestial Toymaker) +$(call declare-filter, drwho-savages, drwho,savages, D/Doctor Who/S03E09 AA. The Savages) +$(call declare-filter, drwho-smugglers, drwho,smugglers, D/Doctor Who/S04E01 CC. The Smugglers) +$(call declare-filter, drwho-highlanders, drwho,highlanders, D/Doctor Who/S04E04 FF. The Highlanders) +$(call declare-filter, drwho-snowmen, drwho,snowmen, D/Doctor Who/S05E02 NN. The Abominable Snowmen) +$(call declare-filter, drwho-wheel, drwho,wheel, D/Doctor Who/S05E07 SS. The Wheel in Space) +$(call declare-filter, drwho-invasion, drwho,invasion, D/Doctor Who/S06E03 VV. The Invasion) +$(call declare-filter, drwho-pirates, drwho,pirates, D/Doctor Who/S06E06 YY. The Space Pirates) +$(call declare-filter, drwho-war-games, drwho,war-games, D/Doctor Who/S06E07 ZZ. The War Games) +$(call declare-filter, drwho-silurians, drwho,silurians, D/Doctor Who/S07E02 BBB. Doctor Who and the Silurians) $(call declare-playlist, dollhouse, D/Dollhouse) +$(call declare-playlist, dune-2000, D/Dune (2000)) $(call declare-playlist, engrenages, E/Engrenages) $(call declare-playlist, equalizer, E/The Equalizer (1985)) +$(call declare-playlist, father-ted, F/Father Ted) $(call declare-playlist, fawlty-towers, F/Fawlty Towers) $(call declare-playlist, firefly, F/Firefly) -$(call declare-chapters, fry-and-laurie, F/A Bit of Fry and Laurie) +$(call declare-playlist, aeon-flux, F/Æon Flux) +$(call declare-chapters, fry-and-laurie, F/A Bit of Fry & Laurie) $(call declare-playlist, game-of-thrones, G/Game of Thrones) $(call declare-playlist, godfather-ii, G/The Godfather Trilogy/02. Part II) $(call declare-playlist, gotham, G/Gotham) @@ -140,14 +146,16 @@ $(call declare-chapters, metallica-s-and-m, M/Metallica—S&M) $(call declare-playlist, the-night-manager, N/The Night Manager) $(call declare-playlist, person-of-interest, P/Person of Interest) $(call declare-playlist, harry-potter, P/Harry Potter) +$(call declare-playlist, police-squad, P/Police Squad!) $(call declare-playlist, prime-suspect, P/Prime Suspect) $(call declare-playlist, the-prisoner, P/The Prisoner) $(call declare-playlist, flying-circus-restored, P/Monty Python's Flying Circus (restored)) #' $(call declare-chapters-only, flying-circus-sketches, P/Monty Python's Flying Circus (sketches)) #' $(call declare-playlist, robin-of-sherwood, R/Robin of Sherwood) +$(call declare-playlist, buck-rogers, R/Buck Rogers in the 25th Century) $(call declare-playlist, rome, R/Rome) $(call declare-playlist, sanctuary, S/Sanctuary) -$(call declare-playlist, sapphire-and-steel, S/Sapphire and Steel) +$(call declare-playlist, sapphire-and-steel, S/Sapphire & Steel) $(call declare-playlist, shark, S/Shark) $(call declare-playlist, sharpe, S/Sharpe) $(call declare-playlist, the-shield, S/The Shield) @@ -176,11 +184,12 @@ $(call declare-playlist, v-2009, V/V (2009)) $(call declare-playlist, the-wire, W/The Wire) $(call declare-playlist, waking-the-dead, W/Waking the Dead) $(call declare-playlist, wonder-woman-1975, W/Wonder Woman (1975)) +$(call declare-playlist, worricker, W/The Worricker trilogy) $(call declare-playlist, yes-minister, Y/Yes Minister) $(call declare-playlist, the-young-ones, Y/The Young Ones) M3US = $(addsuffix .m3u8,$(PLAYLISTS)) -DEPFILES += $(addsuffix .dep,$(PLAYLISTS)) +DEPFILES += $(addsuffix .m3u-dep,$(PLAYLISTS)) TARGETS += $(M3US) CLEANFILES += $(DEPFILES) @@ -194,7 +203,16 @@ mkm3u.cache-stamp: CLEANFILES += *.m3u8.new $(M3US): %.m3u8: $$($$*_EPLS) mkm3u mkm3u.cache-stamp $(call v-tag,MKM3U)./mkm3u $(MKM3UFLAGS) $($*_MKM3UFLAGS) \ - -M$*.dep -O$@ -o"$@.new" "$<" && mv "$@.new" "$@" + -M$*.m3u-dep -O$@ -o"$@.new" "$<" && mv "$@.new" "$@" + +PLS = $(sort $(foreach p,$(PLAYLISTS), \ + $($p_EPLS:.epls=.pl))) +DEPFILES += $(addsuffix -dep,$(PLS)) +TARGETS += $(PLS) +CLEANFILES += *.pl.new +$(PLS): %.pl: %.epls mkm3u mkm3u.cache-stamp + $(call v-tag,MKPL)./mkm3u -D $(MKM3UFLAGS) $($*_MKM3UFLAGS) \ + -M$*.pl-dep -O$@ -o"$@.new" "$<" && mv "$@.new" "$@" CHECKS = $(foreach p,$(PLAYLISTS), check/$p) check: $(CHECKS)