Update Makefile to latest universal version

This is from my settings-configs repo.

Author: joshuaulrich

Makefile

@@ -21,7 +21,8 @@ PKG_INST_FILE = $(R_LIB)/${PKG_NAME}/DESCRIPTION
 PKG_R_FILES := $(wildcard ${PKG_PATH}/R/*.R)
 PKG_RD_FILES := $(wildcard ${PKG_PATH}/man/*.Rd)
 PKG_SRC_FILES := $(wildcard ${PKG_PATH}/src/*)
-PKG_ALL_FILES := ${PKG_PATH}/DESCRIPTION ${PKG_PATH}/NAMESPACE \
+PKG_HEADER_FILES := $(wildcard ${PKG_PATH}/inst/include/*h)
+PKG_ALL_FILES := ${PKG_PATH}/DESCRIPTION ${PKG_PATH}/NAMESPACE ${PKG_HEADER_FILES} \
   $(PKG_R_FILES) $(PKG_RD_FILES) $(PKG_SRC_FILES) ${PKG_PATH}/.Rbuildignore
 
 HTML_FILES := $(patsubst %.Rmd, %.html, $(wildcard *.Rmd)) \
@@ -34,7 +35,7 @@ BENCHMARK_FILE = ${PKG_PATH}/inst/benchmarks/benchmark.subset.R
 
 .PHONY: docs build install check tests test clean
 
-all: check #benchmark
+all: cran
 
 #man/*.Rd depend on R/*.R files
 print:
@@ -55,43 +56,33 @@ $(PKG_INST_FILE): $(PKG_TARGZ)
 # Run R CMD check
 check: docs build
 	@_R_CHECK_CRAN_INCOMING_=false \
-	${R_HOME}/bin/R CMD check ${PKG_TARGZ} --as-cran
+	_PKG_TINYTEST_VERBOSE_=1 _PKG_TINYTEST_COLOR_=FALSE \
+	${R_HOME}/bin/R CMD check ${PKG_TARGZ} --no-vignettes
 
 docs: ${PKG_R_FILES}
 	@${R_HOME}/bin/Rscript -e "roxygen2::roxygenize(roclets='rd')" \
 	  && sed -i '/^RoxygenNote/d' ${PKG_PATH}/DESCRIPTION \
-	  && /bin/rm ${PKG_PATH}/src/*.o \
-	  && /bin/rm ${PKG_PATH}/src/*.so
-
-# Build for CRAN
-#build-cran: $(PKG_TARGZ)
-#$(PKG_TARGZ): $(PKG_ALL_FILES) $(UNIT_TEST_FILES) $(UNIT_TEST_SUITE)
-#	@${R_HOME}/bin/R CMD build ${PKG_BUILD_OPTS} ${PKG_PATH}
-#
-## Install package for CRAN
-#install-cran: build-cran $(PKG_INST_FILE)
-#$(PKG_INST_FILE): $(PKG_TARGZ)
-#	@${R_HOME}/bin/R CMD INSTALL ${PKG_TARGZ}
-#
-## Run R CMD check for CRAN
-#check-cran: install-cran
-#	${R_HOME}/bin/R CMD check ${PKG_TARGZ}
+	  && /bin/rm --force ${PKG_PATH}/src/*.o \
+	  && /bin/rm --force ${PKG_PATH}/src/*.so
+
+# Check for CRAN
+cran:
+	@${R_HOME}/bin/R CMD build ${PKG_PATH} && \
+	_PKG_TINYTEST_VERBOSE_=1 _PKG_TINYTEST_COLOR_=FALSE \
+	_R_CHECK_CRAN_INCOMING_=false ${R_HOME}/bin/R CMD check ${PKG_TARGZ} --as-cran
 
 # Run unit test suite
 tests: install ${UNIT_TEST_FILES}
-	@${R_HOME}/bin/Rscript ${UNIT_TEST_SUITE}
+	@_PKG_TINYTEST_VERBOSE_=2 _PKG_TINYTEST_COLOR_=TRUE \
+	${R_HOME}/bin/Rscript ${UNIT_TEST_SUITE}
+
+html: $(HTML_FILES)
 
-# Run one test file
-TEST_FILE = $(wildcard ${PKG_PATH}/inst/unitTests/*${file}*)
-TEST_CMD = 'suppressMessages({require(${PKG_NAME}); require(RUnit)}); \
-            out <- runTestFile("${TEST_FILE}", verbose = TRUE); \
-            printTextProtocol(out)'
+%.html: %.Rmd
+	R --slave -e "set.seed(100);rmarkdown::render('$<')"
 
-test: install
-ifndef file
-	$(error "file not defined")
-endif
-	@${R_HOME}/bin/Rscript -e ${TEST_CMD}
+%.html: %.md
+	R --slave -e "set.seed(100);rmarkdown::render('$<')"
 
 clean:
-	$(RM) $(HTML_FILES) ${PKG_PATH}/src/*.o ${PKG_PATH}/src/*.so
+	/bin/rm --force $(HTML_FILES) ${PKG_PATH}/src/*.o ${PKG_PATH}/src/*.so