Merge pull request #119 from itcarroll/gh-pages

[rnaseq-cwl-training.git] / Makefile

diff --git a/Makefile b/Makefile
index 3b51c3980040754c590ef14ff06e45115dd93ab2..457de1ee85a2dc08129560ead9296d973d03be66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ DST=_site
 
 # Controls
 .PHONY : commands clean files
+.NOTPARALLEL:
 all : commands
 
 ## commands         : show all commands.
@@ -16,18 +17,17 @@ commands :
        @grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
 
 ## serve            : run a local server.
-serve : lesson-rmd
-       ${JEKYLL} serve --config _config.yml,_config_dev.yml
+serve : lesson-md
+       ${JEKYLL} serve
 
 ## site             : build files but do not run a server.
-site : lesson-rmd
-       ${JEKYLL} build --config _config.yml,_config_dev.yml
+site : lesson-md
+       ${JEKYLL} build
 
 # repo-check        : check repository settings.
 repo-check :
        @bin/repo_check.py -s .
 
-
 ## clean            : clean up junk files.
 clean :
        @rm -rf ${DST}
@@ -54,7 +54,7 @@ workshop-check :
 ## ----------------------------------------
 ## Commands specific to lesson websites.
 
-.PHONY : lesson-check lesson-rmd lesson-files lesson-fixme
+.PHONY : lesson-check lesson-md lesson-files lesson-fixme
 
 # RMarkdown files
 RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
@@ -80,9 +80,12 @@ HTML_DST = \
   $(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 :