Makefile: unify feeds & -archive, fix maxitems param

Makefile

@@ -108,58 +108,37 @@ $(DATESTAMP):
 
 build/%.html : NOVALID:=true
 build/news.html: $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
-build/news-rss.xml : STYLE=xsl/rss.xsl
-build/news-rss.xml : PFLAGS+=--stringparam prefix ""
-build/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/news-archive-rss.xml : STYLE=xsl/rss.xsl
-build/news-archive-rss.xml : PFLAGS+=--stringparam prefix ""
-build/news-archive-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/news-atom.xml : STYLE=xsl/atom.xsl
-build/news-atom.xml : PFLAGS+=--stringparam prefix ""
-build/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
-build/news-archive-atom.xml : STYLE=xsl/atom.xsl
-build/news-archive-atom.xml : PFLAGS+=--stringparam prefix ""
-build/news-archive-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
-build/podcast.xml : STYLE=xsl/podcast.xsl
-build/podcast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/podcast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/podcast-archive.xml : STYLE=xsl/podcast.xsl
-build/podcast-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/podcast-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentaradio.xml : STYLE=xsl/podcast.xsl
-build/pentaradio.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentaradio.xml : PFLAGS+=--stringparam selection pentaradio
-build/pentaradio.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentaradio-archive.xml : STYLE=xsl/podcast.xsl
-build/pentaradio-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentaradio-archive.xml : PFLAGS+=--stringparam selection pentaradio
-build/pentaradio-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentacast.xml : STYLE=xsl/podcast.xsl
-build/pentacast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast.xml : PFLAGS+=--stringparam selection pentacast
-build/pentacast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentacast-archive.xml : STYLE=xsl/podcast.xsl
-build/pentacast-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast-archive.xml : PFLAGS+=--stringparam selection pentacast
-build/pentacast-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamusic.xml : STYLE=xsl/podcast.xsl
-build/pentamusic.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamusic.xml : PFLAGS+=--stringparam selection pentamusic
-build/pentamusic.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamusic-archive.xml : STYLE=xsl/podcast.xsl
-build/pentamusic-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamusic-archive.xml : PFLAGS+=--stringparam selection pentamusic
-build/pentamusic-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamedia.xml : STYLE=xsl/podcast.xsl
-build/pentamedia.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamedia.xml : PFLAGS+=--stringparam selection pentamedia
-build/pentamedia.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamedia-archive.xml : STYLE=xsl/podcast.xsl
-build/pentamedia-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamedia-archive.xml : PFLAGS+=--stringparam selection pentamedia
-build/pentamedia-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-
-build/%-archive.xml build/news-archive-%.xml : PFLAGS+=--stringparam maxitems 9999999
+
+
+build/%.xml : MAX_ITEMS=23
+build/%-archive.xml build/news-archive-%.xml : MAX_ITEMS=9999999
+build/%.xml : PFLAGS+=--param maxitems $(MAX_ITEMS)
+
+build/news-rss.xml build/news-archive-rss.xml : STYLE=xsl/rss.xsl
+build/news-rss.xml build/news-archive-rss.xml : PFLAGS+=--stringparam prefix ""
+build/news-rss.xml build/news-archive-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/news-atom.xml build/news-archive-atom.xml : STYLE=xsl/atom.xsl
+build/news-atom.xml build/news-archive-atom.xml : PFLAGS+=--stringparam prefix ""
+build/news-atom.xml build/news-archive-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
+build/podcast.xml build/podcast-archive.xml : STYLE=xsl/podcast.xsl
+build/podcast.xml build/podcast-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/podcast.xml build/podcast-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentaradio.xml build/pentaradio-archive.xml : STYLE=xsl/podcast.xsl
+build/pentaradio.xml build/pentaradio-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/pentaradio.xml build/pentaradio-archive.xml : PFLAGS+=--stringparam selection pentaradio
+build/pentaradio.xml build/pentaradio-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentacast.xml build/pentacast-archive.xml : STYLE=xsl/podcast.xsl
+build/pentacast.xml build/pentacast-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/pentacast.xml build/pentacast-archive.xml : PFLAGS+=--stringparam selection pentacast
+build/pentacast.xml build/pentacast-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentamusic.xml build/pentamusic-archive.xml : STYLE=xsl/podcast.xsl
+build/pentamusic.xml build/pentamusic-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/pentamusic.xml build/pentamusic-archive.xml : PFLAGS+=--stringparam selection pentamusic
+build/pentamusic.xml build/pentamusic-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
+build/pentamedia.xml build/pentamedia-archive.xml : STYLE=xsl/podcast.xsl
+build/pentamedia.xml build/pentamedia-archive.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/pentamedia.xml build/pentamedia-archive.xml : PFLAGS+=--stringparam selection pentamedia
+build/pentamedia.xml build/pentamedia-archive.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 
 #.INTERMEDIATE: news.xml
 news.xml: $(NEWSITEMS)

xsl/atom.xsl

@@ -13,7 +13,6 @@
               indent="yes"/>
 
   <xsl:variable name="baseurl">https://www.c3d2.de/</xsl:variable>
-  <xsl:variable name="maxitems">10</xsl:variable>
 
   <xsl:template match="news">
     <feed xml:lang="de">

xsl/podcast.xsl

@@ -20,7 +20,6 @@
   <xsl:include href="common.xsl" />
 
   <xsl:variable name="baseurl">http://www.c3d2.de/</xsl:variable>
-  <xsl:variable name="maxitems">23</xsl:variable>
   <xsl:param name="selection" select="''"/>
 
   <xsl:template match="news">
@@ -102,6 +101,7 @@
 
         <xsl:for-each select="newsfile">
           <xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
+	  <xsl:message><xsl:value-of select="position()"/> &lt;= <xsl:value-of select="$maxitems"/>: <xsl:value-of select="position() &lt;= $maxitems"/></xsl:message>
 	  <xsl:if test="position() &lt;= $maxitems">
 	    <xsl:choose>
 	      <xsl:when test="($selection = 'pentaradio' or $selection = 'pentamedia') and

xsl/rss.xsl

@@ -14,7 +14,6 @@
               indent="yes"/>
 
   <xsl:variable name="baseurl">https://www.c3d2.de/</xsl:variable>
-  <xsl:variable name="maxitems">10</xsl:variable>
 
   <xsl:template match="news">
     <xsl:element name="rss">