Skip to content

Commit a28164a

Browse files
committed
minor updates on makefile
1 parent 8ce7e3c commit a28164a

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

Makefile

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ check: $(checkLog)
1212
build: $(tar)
1313

1414
$(tar): $(objects)
15-
@$(MAKE) -s updateTimestamp
16-
Rscript -e "library(methods); devtools::document();";
15+
@$(RM) -rf src/RcppExports.cpp R/RcppExports.R
16+
@Rscript -e "library(methods);" \
17+
-e "Rcpp::compileAttributes()" \
18+
-e "devtools::document();";
19+
@$(MAKE) updateTimestamp
1720
R CMD build --resave-data .
1821

1922
$(checkLog): $(tar)
@@ -37,6 +40,7 @@ updateTimestamp:
3740
.PHONY: TAGS
3841
TAGS:
3942
Rscript -e "utils::rtags(path = 'R', ofile = 'TAGS')"
43+
gtags
4044

4145
.PHONY: clean
4246
clean:

inst/CITATION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
citHeader("To cite reda in publications use:")
1+
citHeader("To cite touch in publications use:")
22

33
citEntry(entry = "Manual",
44
Title = "{touch}: {T}ools of Utilization and Cost in Healthcare",
55
Author = personList(as.person("Wenjie Wang"),
66
as.person("Yan Li"),
77
as.person("Jun Yan")),
8-
Note = "{R} package version 0.1-4",
8+
Note = "{R} package version 0.1-5",
99
Year = "2018",
1010
Url = "https://CRAN.R-project.org/package=touch",
1111

1212
textVersion = paste("Wang, W., Li, Y., Yan, J. (2018). touch:",
1313
"Tools of Utilization and Cost in Healthcare.",
14-
"R package version 0.1-4.",
14+
"R package version 0.1-5",
1515
"https://CRAN.R-project.org/package=touch")
1616
)

misc/copyright.R

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
##
2+
## R package touch by Wenjie Wang, Yan Li, and Jun Yan
3+
## Copyright (C) 2015-2019
4+
##
5+
## This file is part of the R package touch.
6+
##
7+
## The R package touch is free software: You can redistribute it and/or
8+
## modify it under the terms of the GNU General Public License as published by
9+
## the Free Software Foundation, either version 3 of the License, or any later
10+
## version (at your option). See the GNU General Public License at
11+
## <https://www.gnu.org/licenses/> for details.
12+
##
13+
## The R package touch is distributed in the hope that it will be useful,
14+
## but WITHOUT ANY WARRANTY without even the implied warranty of
15+
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
16+
##
17+

0 commit comments

Comments
 (0)