X-Git-Url: https://git.distorted.org.uk/~mdw/epls/blobdiff_plain/197d1151e15f565824db0ba0d9782457f16cad16..HEAD:/Makefile diff --git a/Makefile b/Makefile index c617fbe..000858c 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ $(call declare-playlist, bsg-2003, B/Battlestar Galactica (2003)) $(call declare-playlist, between-the-lines, B/Between the Lines) $(call declare-playlist, blackadder, B/Blackadder) $(call declare-playlist, blakes-7, B/Blake's 7) #' +$(call declare-playlist, james-bond, B/James Bond) $(call declare-playlist, brass-eye, B/Brass Eye) $(call declare-playlist, the-bridge, B/The Bridge) $(call declare-playlist, buffyverse, B/Buffyverse) @@ -98,27 +99,32 @@ $(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, dogtanian, D/Dogtanian) +$(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) @@ -136,12 +142,18 @@ $(call declare-playlist, kingdom-of-heaven, K/Kingdom of Heaven (Definitive Edit $(call declare-playlist, knight-rider, K/Knight Rider) $(call declare-playlist, lexx, L/Lexx) $(call declare-playlist, lois-and-clark, L/Lois and Clark—The New Adventures of Superman) -$(call declare-playlist, morse, M/Inspector Morse) +$(call declare-playlist, looney-tunes, L/Looney Tunes Golden Collection) +$(call declare-playlist, veronica-mars, M/Veronica Mars) $(call declare-playlist, macgyver, M/MacGyver) +$(call declare-playlist, mcu, M/Marvel Cinematic Universe) $(call declare-chapters, metallica-s-and-m, M/Metallica—S&M) +$(call declare-playlist, morse, M/Inspector Morse) $(call declare-playlist, the-night-manager, N/The Night Manager) +$(call declare-playlist, nymphomaniac, N/Nymphomaniac) +$(call declare-playlist, penelope-pitstop, P/The Perils of Penelope Pitstop) $(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)) #' @@ -168,6 +180,8 @@ $(call declare-filter, stargate-sg1, stargate,sg1, S/Stargate SG-1) $(call declare-filter, stargate-atlantis, stargate,sga, S/Stargate Atlantis) $(call declare-filter, stargate-universe, stargate,sgu, S/Stargate Universe) $(call declare-playlist, state-of-play, S/State of Play) +$(call declare-playlist, strike, S/Strike) +$(call declare-playlist, tom-and-jerry, T/Tom and Jerry) $(call declare-playlist, terminator-scc, T/Terminator—The Sarah Connor Chronicles) $(call declare-playlist, traffik, T/Traffik) $(call declare-playlist, the-tripods, T/The Tripods) @@ -177,14 +191,16 @@ $(call declare-playlist, ultraviolet, U/Ultraviolet) $(call declare-playlist, v-1983, V/V (1983)) $(call declare-playlist, v-2009, V/V (2009)) $(call declare-playlist, the-wire, W/The Wire) +$(call declare-playlist, wacky-races, W/Wacky Races) $(call declare-playlist, waking-the-dead, W/Waking the Dead) +$(call declare-playlist, westworld, W/Westworld) $(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) @@ -198,7 +214,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)