X-Git-Url: https://git.distorted.org.uk/~mdw/epls/blobdiff_plain/151b3c4f3f5cb4edcdc95ba144f85b3dbb993ee1..9b82ff075c7dfbaf6b5588c4a6d7b9675409bf47:/Makefile

diff --git a/Makefile b/Makefile
index b5494b9..55acc69 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ $1_MKM3UFLAGS		 =
 endef
 
 define %declare-chapter-playlist
-$1-chap_EPLS		 = $1.epls
-$1-chap_MKM3UFLAGS	 = -c
+$1_EPLS			 = $2.epls
+$1_MKM3UFLAGS		 = -c
 endef
 
 define %declare-filter-playlist
@@ -41,11 +41,14 @@ endef
 declare-playlist	 = \
 	$(eval $(call %declare-playlist,$1,$2)) \
 	$(eval $(call %declare-simple-playlist,$1))
+declare-chapters-only	 = \
+	$(eval $(call %declare-playlist,$1,$2)) \
+	$(eval $(call %declare-chapter-playlist,$1,$1))
 declare-chapters	 = \
 	$(eval $(call %declare-playlist,$1,$2)) \
 	$(eval $(call %declare-simple-playlist,$1)) \
 	$(eval $(call %declare-playlist,$1-chap,$2 (chapters))) \
-	$(eval $(call %declare-chapter-playlist,$1))
+	$(eval $(call %declare-chapter-playlist,$1-chap,$1))
 declare-filter		 = \
 	$(eval $(call %declare-playlist,$1,$4)) \
 	$(eval $(call %declare-filter-playlist,$1,$2,$3))
@@ -54,28 +57,32 @@ ARCHIVEROOT		 = ../archive
 
 $(call declare-playlist, 24, \#/24)
 $(call declare-playlist, agent-carter, A/Agent Carter)
-#$(call declare-playlist, agents-of-shield, A/Agents of SHIELD)
-#$(call declare-playlist, andromeda, A/Andromeda)
-#$(call declare-playlist, arrow, A/Arrow)
-#$(call declare-playlist, arrowverse, A/Arrowverse)
-#$(call declare-playlist, a-team, A/The A-Team)
-#$(call declare-playlist, the-americans, A/The Americans)
+$(call declare-playlist, agents-of-shield, A/Agents of SHIELD)
+$(call declare-playlist, andromeda, A/Andromeda)
+$(call declare-playlist, arrowverse, A/Arrowverse)
+$(call declare-filter, arrow, arrowverse,arr, A/Arrow)
+$(call declare-filter, the-flash, arrowverse,fls, F/The Flash)
+$(call declare-filter, constantine, arrowverse,cns, C/Constantine)
+$(call declare-filter, supergirl, arrowverse,spg, S/Supergirl)
+$(call declare-filter, legends-of-tomorrow, arrowverse,lot, L/Legends of Tomorrow)
+$(call declare-filter, batwoman, arrowverse,bwm, B/Batwoman)
+$(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!)
-$(call declare-playlist, angel, A/Angel)
 $(call declare-playlist, babylon-5, B/Babylon 5)
-#$(call declare-playlist, batman-1966, B/Batman (1966 series))
+$(call declare-playlist, batman-1966, B/Batman (1966 series))
 $(call declare-playlist, bsg-1978, B/Battlestar Galactica (1978))
-#$(call declare-playlist, bsg-1980, B/Battlestar Galactica 1980)
-#$(call declare-playlist, bsg-2003, B/Battlestar Galactica (2003))
-#$(call declare-playlist, batwoman, B/Batwoman)
+$(call declare-playlist, bsg-1980, B/Battlestar Galactica 1980)
+$(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, brass-eye, B/Brass Eye)
 $(call declare-playlist, the-bridge, B/The Bridge)
-$(call declare-playlist, btvs, B/Buffy the Vampire Slayer)
+$(call declare-playlist, buffyverse, B/Buffyverse)
+$(call declare-filter, btvs, buffyverse,b, B/Buffy the Vampire Slayer)
+$(call declare-filter, angel, buffyverse,a, A/Angel)
 #$(call declare-playlist, caprica, C/Caprica)
-#$(call declare-playlist, constantine, C/Constantine)
 #$(call declare-playlist, cracker, C/Cracker)
 #$(call declare-playlist, crow-stairway, C/The Crow—Stairway to Heaven)
 #$(call declare-playlist, danger-mouse, D/Danger Mouse)
@@ -87,7 +94,6 @@ $(call declare-playlist, dollhouse, D/Dollhouse)
 $(call declare-playlist, equalizer, E/The Equalizer (1985))
 $(call declare-playlist, fawlty-towers, F/Fawlty Towers)
 $(call declare-playlist, firefly, F/Firefly)
-#$(call declare-playlist, the-flash, F/The Flash)
 $(call declare-chapters, fry-and-laurie, F/A Bit of Fry and Laurie)
 $(call declare-playlist, game-of-thrones, G/Game of Thrones)
 #$(call declare-playlist, godfather-ii, G/The Godfather Trilogy/02. Part II)
@@ -102,8 +108,7 @@ $(call declare-playlist, sherlock-holmes, H/Sherlock Holmes (1984))
 #$(call declare-playlist, kill-bill, K/Kill Bill)
 #$(call declare-playlist, the-killing, K/The Killing)
 #$(call declare-playlist, kingdom-of-heaven, K/Kingdom of Heaven (Definitive Edition))
-#$(call declare-playlist, knight-rider, K/Knight Rider)
-#$(call declare-playlist, legends-of-tomrrow, L/Legends of Tomorrow)
+$(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)
@@ -112,7 +117,8 @@ $(call declare-playlist, macgyver, M/MacGyver)
 #$(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-chapters, flying-circus, P/Monty Python's Flying Circus) #'
+$(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, rome, R/Rome)
 #$(call declare-playlist, sanctuary, S/Sanctuary)
@@ -128,7 +134,6 @@ $(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, supergirl, S/Supergirl)
 $(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)