Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

enhance Rlazy target

git-svn-id: https://svn.r-project.org/R/trunk@56467 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit af6cea92f7a6022f40ee9a2ea3d2d324d043fb31 1 parent 5b7e035
ripley authored
View
6 share/make/lazycomp.mk
@@ -8,8 +8,8 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=$(DEFPKGS) LC_ALL=C $(R_EXE) > /dev/null
-Rsimple: mkRsimple
-Rlazy: mkRsimple mklazy
-Rlazycomp: mkRsimple mklazycomp
+Rsimple: mkR mkRsimple
+Rlazy: mkR mkRsimple mklazy
+Rlazycomp: mkR mkRsimple mklazycomp
View
8 src/library/base/Makefile.in
@@ -40,12 +40,14 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
-Rsimple: mkRsimple
+mkR: mkRbase
-Rlazy: mkRsimple
+Rsimple: mkR mkRsimple
+
+Rlazy: mkR mkRsimple
@cat $(srcdir)/makebasedb.R | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
-Rlazycomp: mkRsimple mklazycomp
+Rlazycomp: mkR mkRsimple mklazycomp
View
2  src/library/compiler/Makefile.in
@@ -33,5 +33,7 @@ $(srcdir)/R/cmp.R: $(srcdir)/noweb/compiler.nw
@echo "re-making 'R/cmp.R'"
@$(NOTANGLE) -Rcmp.R $(srcdir)/noweb/compiler.nw > $(srcdir)/R/cmp.R
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
2  src/library/datasets/Makefile.in
@@ -36,5 +36,7 @@ all: Makefile DESCRIPTION
include $(top_srcdir)/share/make/basepkg.mk
+mkR: mkR1
+
# dummy targets
Rsimple Rlazy Rlazycomp:
View
2  src/library/grDevices/Makefile.in
@@ -30,5 +30,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@$(R_GZIPCMD) -9f $(top_builddir)/library/grDevices/afm/*.afm
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
2  src/library/graphics/Makefile.in
@@ -27,5 +27,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
2  src/library/grid/Makefile.in
@@ -30,5 +30,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
6 src/library/methods/Makefile.in
@@ -27,6 +27,8 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) RfilesLazy EXTRAS2=$(EXTRAS)
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) RfilesLazy
+mkR: mkR2
+
include $(top_srcdir)/share/make/basepkg.mk
RfilesLazy: $(top_builddir)/library/$(pkg)/R/$(pkg).rdb
@@ -51,10 +53,10 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R $(srcdir)/NAMESPACE \
## not supported
Rsimple:
-Rlazy:
+Rlazy: mkR
@rm -f $(top_builddir)/library/$(pkg)/R/$(pkg).rdb
@$(MAKE) RfilesLazy
-Rlazycomp:
+Rlazycomp: mkR
@rm -f $(top_builddir)/library/$(pkg)/R/$(pkg).rdb
@$(MAKE) RfilesLazy EXTRAS2=$(EXTRAS)
View
2  src/library/splines/Makefile.in
@@ -29,5 +29,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
2  src/library/stats/Makefile.in
@@ -31,5 +31,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
2  src/library/stats4/Makefile.in
@@ -25,5 +25,7 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR2
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
11 src/library/tcltk/Makefile.in
@@ -44,5 +44,16 @@ all: Makefile DESCRIPTION
$(MAKE) $(MKLAZY); \
fi
+mkR:
+ @(f=$${TMPDIR:-/tmp}/R$$$$; \
+ if test @use_tcltk@ = yes; then \
+ cat $(RSRC) > $${f}; \
+ $(SHELL) $(top_srcdir)/tools/move-if-change $${f} all.R ; \
+ else \
+ $(SHELL) $(top_srcdir)/tools/copy-if-change \
+ $(srcdir)/R/unix/zzzstub.R \
+ $(top_builddir)/library/$(pkg)/R/$(pkg) ; \
+ fi)
+
include $(top_srcdir)/share/make/basepkg.mk
include $(top_srcdir)/share/make/lazycomp.mk
View
8 src/library/tools/Makefile.in
@@ -40,6 +40,8 @@ all: Makefile DESCRIPTION
@$(ECHO) "tools:::.install_package_description('.', '"$(top_builddir)/library/${pkg}"')" | \
R_DEFAULT_PACKAGES=NULL $(R_EXE) > /dev/null
+mkR: mkR1
+
include $(top_srcdir)/share/make/basepkg.mk
$(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@@ -50,12 +52,12 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
-Rsimple: mkRsimple
+Rsimple: mkR mkRsimple
-Rlazy: mkRsimple
+Rlazy: mkR mkRsimple
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@(cat $(srcdir)/R/makeLazyLoad.R; \
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
-Rlazycomp: mkRsimple mklazycomp
+Rlazycomp: mkR mkRsimple mklazycomp
View
2  src/library/utils/Makefile.in
@@ -31,6 +31,8 @@ all: Makefile DESCRIPTION
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
+mkR: mkR1
+
iconvlist: $(top_builddir)/library/$(pkg)/iconvlist
$(top_builddir)/library/$(pkg)/iconvlist:
Please sign in to comment.
Something went wrong with that request. Please try again.