about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorCase Duckworth2015-03-24 22:55:57 -0700
committerCase Duckworth2015-03-24 22:55:57 -0700
commit616150da783ec72637f5ddd21547ee18c8378b22 (patch)
tree09dfd2f04e8b2e148b38df60c0e7b941a670edfb /src
parentChange template and CSS for flatter structure (diff)
downloadautocento-616150da783ec72637f5ddd21547ee18c8378b22.tar.gz
autocento-616150da783ec72637f5ddd21547ee18c8378b22.zip
Update makefile to sidestep pandoc error
Diffstat (limited to 'src')
-rw-r--r--src/makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/makefile b/src/makefile index dc8835c..57b42c8 100644 --- a/src/makefile +++ b/src/makefile
@@ -15,8 +15,11 @@ LOZENGE = ../js/lozenge.js
15LOZupd = ../js/update-lozenge.sh 15LOZupd = ../js/update-lozenge.sh
16 16
17# Do everything 17# Do everything
18.PHONY: all 18.PHONY: all html river lozenge
19all : $(HTMLs) $(RIVERs) lozenge 19all : html river lozenge
20html : $(HTMLs)
21river : $(RIVERs)
22lozenge : $(LOZENGE)
20 23
21# Generic rule for HTML targets and Markdown sources 24# Generic rule for HTML targets and Markdown sources
22%.html : %.txt 25%.html : %.txt
@@ -24,9 +27,11 @@ all : $(HTMLs) $(RIVERs) lozenge
24 27
25# Generic rule for RIVER targets and Markdown sources 28# Generic rule for RIVER targets and Markdown sources
26%.river : %.txt 29%.river : %.txt
27 pandoc $< -f markdown -t $(LUAdir)/river.lua $(RIVopts) -o $(RIVdir)/$@ 30 @echo River-ing $@
31 @sed "s/[^A-Za-z0-9'-]/ /g" $< |\
32 pandoc - -f markdown -t $(LUAdir)/river.lua $(RIVopts) -o $(RIVdir)/$@
28 33
29lozenge : $(HTMLdir)/$(HTMLs) 34$(LOZENGE) : $(HTMLdir)/$(HTMLs)
30 @echo "Updating lozenge.js..." 35 @echo "Updating lozenge.js..."
31 @list=`ls $(HTMLdir)/*.html |\ 36 @list=`ls $(HTMLdir)/*.html |\
32 sed -e 's,../,,g' |\ 37 sed -e 's,../,,g' |\
@@ -35,3 +40,4 @@ lozenge : $(HTMLdir)/$(HTMLs)
35 -e 's/^\(.*\),$$/var files=[\1]/'` &&\ 40 -e 's/^\(.*\),$$/var files=[\1]/'` &&\
36 sed -i "s/var files=.*/$$list/" $(LOZENGE) 41 sed -i "s/var files=.*/$$list/" $(LOZENGE)
37# TODO: add compiling hapax 42# TODO: add compiling hapax
43# TODO: add first line compiler