Skip to content

Commit d62084b

Browse files
authored
Merge pull request #119 from itcarroll/gh-pages
Knit episodes only when any one RMarkdown source changes
2 parents 3d96a51 + 8fb905e commit d62084b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ DST=_site
99

1010
# Controls
1111
.PHONY : commands clean files
12+
.NOTPARALLEL:
1213
all : commands
1314

1415
## commands : show all commands.
1516
commands :
1617
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
1718

1819
## serve : run a local server.
19-
serve : lesson-rmd
20+
serve : lesson-md
2021
${JEKYLL} serve
2122

2223
## site : build files but do not run a server.
23-
site : lesson-rmd
24+
site : lesson-md
2425
${JEKYLL} build
2526

2627
# repo-check : check repository settings.
@@ -53,7 +54,7 @@ workshop-check :
5354
## ----------------------------------------
5455
## Commands specific to lesson websites.
5556

56-
.PHONY : lesson-check lesson-rmd lesson-files lesson-fixme
57+
.PHONY : lesson-check lesson-md lesson-files lesson-fixme
5758

5859
# RMarkdown files
5960
RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
@@ -79,9 +80,12 @@ HTML_DST = \
7980
$(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \
8081
${DST}/license/index.html
8182

82-
## lesson-rmd : convert Rmarkdown files to markdown
83-
lesson-rmd: $(RMD_SRC)
84-
@bin/knit_lessons.sh $(RMD_SRC)
83+
## lesson-md : convert Rmarkdown files to markdown
84+
lesson-md : ${RMD_DST}
85+
86+
# Use of .NOTPARALLEL makes rule execute only once
87+
${RMD_DST} : ${RMD_SRC}
88+
@bin/knit_lessons.sh ${RMD_SRC}
8589

8690
## lesson-check : validate lesson Markdown.
8791
lesson-check :

0 commit comments

Comments
 (0)