summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNick White <git@njw.me.uk>2010-09-26 12:51:14 +0100
committerNick White <git@njw.me.uk>2010-09-26 12:51:14 +0100
commit33d710efd825eb493459494821dda22467011973 (patch)
treecb4df409bf1c70941ada3866400a1e0f61b19de0 /Makefile
parent7a0c25eac0f1c2adf031343ff8c761ba73570cb6 (diff)
downloadnjw-website-33d710efd825eb493459494821dda22467011973.tar.bz2
njw-website-33d710efd825eb493459494821dda22467011973.zip
Merge pubs and articles to writing
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 112e96c..46d70b1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,10 @@ MD=smu
MDTEX=/home/nick/src/misc/smu/smu
RSS=index.ttl
-BIB=pubs/index.ttl
-BIBTXT=pubs/index.txt
+BIB=writing/index.ttl
+BIBTXT=writing/index.txt
PAGES=$(shell find . -name '*.txt' ! -name 'robots.txt' ! -name $(RSS)) $(BIBTXT)
-PUBS=$(shell find ./pubs/ -name '*.txt' ! -name 'index.*')
-ARTS=$(shell find ./articles/ -name '*.txt' ! -name 'index.*')
+WRITING=$(shell find ./writing/ -name '*.txt' ! -name 'index.*')
EXTRAS=$(shell find . -name '*.css') card.ttl
TARGETS=$(PAGES:.txt=.html) $(RSS) $(BIBTXT)
GZIP=$(PAGES:=.gz) $(TARGETS:=.gz) $(EXTRAS:=.gz) $(BIB:=.gz)
@@ -47,13 +46,11 @@ $(RSS): $(PAGES)
echo making $@
sh makerss.sh $(SITENAME) $(FOAF) $* > $@
-pubs/index.txt: $(BIB)
+writing/index.txt: $(BIB) $(WRITING)
echo making $@
- sh bibtotxt.sh $< > $@
-
-articles/index.txt: $(ARTS)
- echo making $@
- sh dirindex.sh articles > $@
+ cat includes/writingheader.txt > $@
+ sh bibtotxt.sh $(BIB) >> $@
+ sh listarticles.sh writing $(BIB) >> $@
clean:
rm -f -- $(TARGETS) $(GZIP)