From 616150da783ec72637f5ddd21547ee18c8378b22 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 24 Mar 2015 22:55:57 -0700 Subject: Update makefile to sidestep pandoc error --- src/makefile | 14 ++++++++++---- 1 file 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 LOZupd = ../js/update-lozenge.sh # Do everything -.PHONY: all -all : $(HTMLs) $(RIVERs) lozenge +.PHONY: all html river lozenge +all : html river lozenge +html : $(HTMLs) +river : $(RIVERs) +lozenge : $(LOZENGE) # Generic rule for HTML targets and Markdown sources %.html : %.txt @@ -24,9 +27,11 @@ all : $(HTMLs) $(RIVERs) lozenge # Generic rule for RIVER targets and Markdown sources %.river : %.txt - pandoc $< -f markdown -t $(LUAdir)/river.lua $(RIVopts) -o $(RIVdir)/$@ + @echo River-ing $@ + @sed "s/[^A-Za-z0-9'-]/ /g" $< |\ + pandoc - -f markdown -t $(LUAdir)/river.lua $(RIVopts) -o $(RIVdir)/$@ -lozenge : $(HTMLdir)/$(HTMLs) +$(LOZENGE) : $(HTMLdir)/$(HTMLs) @echo "Updating lozenge.js..." @list=`ls $(HTMLdir)/*.html |\ sed -e 's,../,,g' |\ @@ -35,3 +40,4 @@ lozenge : $(HTMLdir)/$(HTMLs) -e 's/^\(.*\),$$/var files=[\1]/'` &&\ sed -i "s/var files=.*/$$list/" $(LOZENGE) # TODO: add compiling hapax +# TODO: add first line compiler -- cgit 1.4.1-21-gabe81