X-Git-Url: https://git.distorted.org.uk/~mdw/epls/blobdiff_plain/50a7c91c7c6178a8dc7e6b7f8180ef9fb12fd764..892a24a6eaeff5aaeebae6054dfbd96cf2499853:/Makefile

diff --git a/Makefile b/Makefile
index 2f845ce..8ca1252 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ $(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,masterplan, D/Doctor Who/S03E04 V. The Daleks' Master Plan) #'
+$(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)
@@ -118,8 +118,10 @@ $(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-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)
@@ -142,8 +144,10 @@ $(call declare-playlist, morse, M/Inspector Morse)
 $(call declare-playlist, macgyver, M/MacGyver)
 $(call declare-chapters, metallica-s-and-m, M/Metallica—S&M)
 $(call declare-playlist, the-night-manager, N/The Night Manager)
+$(call declare-playlist, nymphomaniac, N/Nymphomaniac)
 $(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)) #'
@@ -170,6 +174,7 @@ $(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, terminator-scc, T/Terminator—The Sarah Connor Chronicles)
 $(call declare-playlist, traffik, T/Traffik)
 $(call declare-playlist, the-tripods, T/The Tripods)
@@ -180,13 +185,14 @@ $(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, 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)
 
@@ -200,7 +206,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)