projects
/
rnaseq-cwl-training.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4030b74
)
changes lesson-rmd target to lesson-md with new recipe
author
Ian Carroll <icarroll@sesync.org>
Sat, 31 Dec 2016 01:49:20 +0000
(20:49 -0500)
committer
Ian Carroll <icarroll@sesync.org>
Sat, 31 Dec 2016 01:50:35 +0000
(20:50 -0500)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 0f395a310aeb0d795abed5ef50a77ee745337236..457de1ee85a2dc08129560ead9296d973d03be66 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-9,6
+9,7
@@
DST=_site
# Controls
.PHONY : commands clean files
# Controls
.PHONY : commands clean files
+.NOTPARALLEL:
all : commands
## commands : show all commands.
all : commands
## commands : show all commands.
@@
-16,11
+17,11
@@
commands :
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
## serve : run a local server.
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
## serve : run a local server.
-serve : lesson-
r
md
+serve : lesson-md
${JEKYLL} serve
## site : build files but do not run a server.
${JEKYLL} serve
## site : build files but do not run a server.
-site : lesson-
r
md
+site : lesson-md
${JEKYLL} build
# repo-check : check repository settings.
${JEKYLL} build
# repo-check : check repository settings.
@@
-53,7
+54,7
@@
workshop-check :
## ----------------------------------------
## Commands specific to lesson websites.
## ----------------------------------------
## Commands specific to lesson websites.
-.PHONY : lesson-check lesson-
r
md lesson-files lesson-fixme
+.PHONY : lesson-check lesson-md lesson-files lesson-fixme
# RMarkdown files
RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
# RMarkdown files
RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
@@
-79,9
+80,12
@@
HTML_DST = \
$(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \
${DST}/license/index.html
$(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \
${DST}/license/index.html
-## lesson-rmd : convert Rmarkdown files to markdown
-lesson-rmd: $(RMD_SRC)
- @bin/knit_lessons.sh $(RMD_SRC)
+## lesson-md : convert Rmarkdown files to markdown
+lesson-md : ${RMD_DST}
+
+# Use of .NOTPARALLEL makes rule execute only once
+${RMD_DST} : ${RMD_SRC}
+ @bin/knit_lessons.sh ${RMD_SRC}
## lesson-check : validate lesson Markdown.
lesson-check :
## lesson-check : validate lesson Markdown.
lesson-check :