Simplify Makefile

.gitignore

@@ -1,4 +1,4 @@
-css/sprites.css
-img/sprites.png
-opml/
-!opml/dirdirdir.opml
+/css/sprites.css
+/img/sprites.png
+/opml/
+!/opml/dirdirdir.opml

Makefile

@@ -1,44 +1,26 @@
-.PHONY: all
-all: css/sprites.css opml/feeds.opml opml/noaa/nhc.opml opml/noaa/ndbc.opml opml/cta.opml opml/enviroflash.opml opml/uk-highways.opml
+.PHONY: all validate
+all: css/sprites.css $(patsubst xquery/opml/%.xqy,opml/%.opml,$(wildcard xquery/opml/*.xqy))
 
 USER_AGENT:="RSRSSS/1.0 (+https://envs.net/~lucidiot/rsrsss/feed.xml)"
 export XIDEL_OPTIONS:=--silent --user-agent=$(USER_AGENT) --wait=1
 
-opml/feeds.opml: feed.xml xquery/feeds_opml.xqy
-	xidel feed.xml --extract-kind=xquery3 --extract-file=xquery/feeds_opml.xqy --output-format=xml > $@
-	chmod a+r $@
-
-opml/noaa/nhc.opml: xquery/noaa/nhc_opml.xqy
+opml/%.opml: xquery/opml/%.xqy
 	mkdir -p -ma=x,u=rwx $(dir $@)
-	xidel --extract-kind=xquery3 --extract-file=xquery/noaa/nhc_opml.xqy --output-format=xml > $@
+	xidel --extract-kind=xquery3 --extract-file="$<" --output-format=xml > $@
 	chmod a+r $@
 
-opml/noaa/ndbc.opml: xquery/noaa/ndbc_opml.xqy
+opml/feeds.opml: xquery/opml/feeds.xqy feed.xml
 	mkdir -p -ma=x,u=rwx $(dir $@)
-	xidel --extract-kind=xquery3 --extract-file=xquery/noaa/ndbc_opml.xqy --output-format=xml > $@
+	xidel feed.xml --extract-kind=xquery3 --extract-file="$<" --output-format=xml > $@
 	chmod a+r $@
 
-opml/cta.opml: xquery/cta_opml.xqy
-	xidel --extract-kind=xquery3 --extract-file=xquery/cta_opml.xqy --output-format=xml > $@
+img/sprites.png: $(wildcard img/sprites/*.png)
+	convert $^ +append $@
 	chmod a+r $@
 
-opml/enviroflash.opml: xquery/enviroflash_opml.xqy
-	xidel --extract-kind=xquery3 --extract-file=xquery/enviroflash_opml.xqy --output-format=xml > $@
+css/sprites.css: xquery/build_sprites_css.xqy img/sprites.png
+	xidel --extract-kind=xquery3 --extract-file="$<" > $@
 	chmod a+r $@
 
-opml/uk-highways.opml: xquery/uk_highways_opml.xqy
-	xidel --extract-kind=xquery3 --extract-file=xquery/uk_highways_opml.xqy --output-format=xml > $@
-	chmod a+r $@
-
-sprites := $(wildcard img/sprites/*.png)
-
-img/sprites.png: $(sprites)
-	convert $(sprites) +append $@
-	chmod a+r $@
-
-css/sprites.css: img/sprites.png xquery/build_sprites_css.xqy
-	xidel --extract-kind=xquery3 --extract-file=xquery/build_sprites_css.xqy > $@
-	chmod a+r $@
-
-validate: feed.xml
-	xidel --extract-kind=xquery3 --extract-file=xquery/validator.xqy
+validate: xquery/validator.xqy feed.xml
+	xidel --extract-kind=xquery3 --extract-file="$<"