rename feed_* to meta_feed_* and simplify wildcard function call

diff --git a/Makefile b/Makefile
index 4fb327f..d4a1667 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-SRC := $(filter-out $(wildcard feed_*) meta_notes.m4,$(wildcard *.m4))
+SRC := $(filter-out $(wildcard meta_*),$(wildcard *.m4))

 OUTPUTS := $(patsubst %.m4,out/%.html,$(SRC))
 STATIC := $(patsubst static/%,out/%,$(wildcard static/*))
 
 all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)
 
 out/%.html: %.m4 header.html footer.html ; m4 $< > $@
 OUTPUTS := $(patsubst %.m4,out/%.html,$(SRC))
 STATIC := $(patsubst static/%,out/%,$(wildcard static/*))
 
 all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)
 
 out/%.html: %.m4 header.html footer.html ; m4 $< > $@

-out/notes.atom: feed_atom.m4 ; m4 $< > $@
-out/notes.rss: feed_rss.m4 ; m4 $< > $@
+out/notes.atom: meta_feed_atom.m4 ; m4 $< > $@
+out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@

 $(STATIC): ; ln -s $(PWD)/static/$(notdir $@) $@
 
 deploy:
 $(STATIC): ; ln -s $(PWD)/static/$(notdir $@) $@
 
 deploy:

diff --git a/feed_atom.m4 b/feed_atom.m4
deleted file mode 100644 (file)
index f0c9a46..0000000
--- a/feed_atom.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-include(meta_notes.m4)dnl
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
-<title>Amin Bandali's Personal Site</title>
-<id>tag:bandali.eu.org,atom,notes/</id>
-<link href="https://bandali.eu.org/notes.atom" rel="self" type="application/atom+xml"/>
-<link href="https://bandali.eu.org" rel="alternate" type="text/html"/>
-<updated>syscmd(date -Iseconds -u | tr -d \\n)</updated>
-define(__feed_atom)dnl
-define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1,
-  `pushdef(`$1',$2)$4`'popdef(`$1')$0(`$1',decr($2),$3,`$4')')')')
-fordown(`__i',__latest,eval(__latest-10),`
-  syscmd(sed "s/\&/\&amp;/g;s/>/\&gt;/g;s/</\&lt;/g" _get(`notes', __i).m4 | m4 -D__feed_atom)')
-</feed>

diff --git a/feed_rss.m4 b/feed_rss.m4
deleted file mode 100644 (file)
index 8ebecd8..0000000
--- a/feed_rss.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-include(meta_notes.m4)dnl
-<?xml version="1.0" encoding="UTF-8" ?>
-<rss version="2.0">
-<channel>
-<title>Amin Bandali's Personal Site</title>
-<description>Notes and blog posts by Amin Bandali</description>
-<link>https://bandali.eu.org</link>
-<lastBuildDate>syscmd(date -uR | tr -d \\n)</lastBuildDate>
-<pubDate>syscmd(date -uR | tr -d \\n)</pubDate>
-<ttl>1800</ttl>
-define(__feed_rss)dnl
-define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1,
-  `pushdef(`$1',$2)$4`'popdef(`$1')$0(`$1',decr($2),$3,`$4')')')')
-fordown(`__i',__latest,eval(__latest-10),`
-  syscmd(sed "s/\&/\&amp;/g;s/>/\&gt;/g;s/</\&lt;/g" _get(`notes', __i).m4 | m4 -D__feed_rss)')
-</channel>
-</rss>

diff --git a/meta_feed_atom.m4 b/meta_feed_atom.m4
new file mode 100644 (file)
index 0000000..f0c9a46
--- /dev/null
+++ b/meta_feed_atom.m4
@@ -0,0 +1,14 @@
+include(meta_notes.m4)dnl
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
+<title>Amin Bandali's Personal Site</title>
+<id>tag:bandali.eu.org,atom,notes/</id>
+<link href="https://bandali.eu.org/notes.atom" rel="self" type="application/atom+xml"/>
+<link href="https://bandali.eu.org" rel="alternate" type="text/html"/>
+<updated>syscmd(date -Iseconds -u | tr -d \\n)</updated>
+define(__feed_atom)dnl
+define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1,
+  `pushdef(`$1',$2)$4`'popdef(`$1')$0(`$1',decr($2),$3,`$4')')')')
+fordown(`__i',__latest,eval(__latest-10),`
+  syscmd(sed "s/\&/\&amp;/g;s/>/\&gt;/g;s/</\&lt;/g" _get(`notes', __i).m4 | m4 -D__feed_atom)')
+</feed>

diff --git a/meta_feed_rss.m4 b/meta_feed_rss.m4
new file mode 100644 (file)
index 0000000..8ebecd8
--- /dev/null
+++ b/meta_feed_rss.m4
@@ -0,0 +1,17 @@
+include(meta_notes.m4)dnl
+<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0">
+<channel>
+<title>Amin Bandali's Personal Site</title>
+<description>Notes and blog posts by Amin Bandali</description>
+<link>https://bandali.eu.org</link>
+<lastBuildDate>syscmd(date -uR | tr -d \\n)</lastBuildDate>
+<pubDate>syscmd(date -uR | tr -d \\n)</pubDate>
+<ttl>1800</ttl>
+define(__feed_rss)dnl
+define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1,
+  `pushdef(`$1',$2)$4`'popdef(`$1')$0(`$1',decr($2),$3,`$4')')')')
+fordown(`__i',__latest,eval(__latest-10),`
+  syscmd(sed "s/\&/\&amp;/g;s/>/\&gt;/g;s/</\&lt;/g" _get(`notes', __i).m4 | m4 -D__feed_rss)')
+</channel>
+</rss>