Permalink
Browse files

some cleaning up

git-svn-id: https://svn.r-project.org/R/trunk@59853 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent b9e3ece commit e6f375716cedb35ad2ba63dbc5c9002f57e9dcc2 ripley committed Jul 16, 2012
View
@@ -114,7 +114,7 @@ mkexec:
done; \
fi
-## only use if byte-compilation is disabled
+## only used if byte-compilation is disabled
mklazy:
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@$(ECHO) "tools:::makeLazyLoading(\"$(pkg)\")" | \
@@ -126,16 +126,6 @@ mkRsimple:
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@rm -f $(top_builddir)/library/$(pkg)/R/$(pkg).rd?
-mkpo:
- @if test -d $(srcdir)/inst/po; then \
- if test "$(USE_NLS)" = "yes"; then \
- $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/po; \
- cp -pr $(srcdir)/inst/po/* $(top_builddir)/library/$(pkg)/po; \
- find "$(top_builddir)/library/$(pkg)/po" -name .svn -type d -prune \
- -exec rm -rf \{\} \; 2>/dev/null; \
- fi; \
- fi
-
mksrc:
@if test -d src; then \
(cd src && $(MAKE)) || exit 1; \
@@ -27,7 +27,7 @@ update:
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @WHICH="@WHICH@" $(MAKE) mkRbase mkdesc2 mkdemos2 mkpo
+ @WHICH="@WHICH@" $(MAKE) mkRbase mkdesc2 mkdemos2
@$(INSTALL_DATA) $(srcdir)/inst/CITATION $(top_builddir)/library/$(pkg)
include $(top_srcdir)/share/make/basepkg.mk
@@ -18,7 +18,7 @@ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R`
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc2 mkdemos2 mkpo
+ @$(MAKE) -f Makefile.win mkR1 mkdesc2 mkdemos2
@$(INSTALL_DATA) $(srcdir)/inst/CITATION $(top_builddir)/library/$(pkg)
@if ! test $(top_builddir)/library/$(pkg)/R/$(pkg) -nt all.R; then \
$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \
@@ -23,7 +23,7 @@ DEFPKGS = NULL
all: Makefile DESCRIPTION @MAINTAINER_MODE_TRUE@ from-noweb
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc mkpo
+ @$(MAKE) mkR1 mkdesc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -17,7 +17,7 @@ DEFPKGS = NULL
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkpo
+ @$(MAKE) -f Makefile.win mkR1 mkdesc
@$(MAKE) -f Makefile.win mklazycomp
mkR: mkR1
@@ -24,7 +24,7 @@ DEFPKGS = NULL
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc mkpo instdirs
+ @$(MAKE) mkR1 mkdesc instdirs
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -19,7 +19,7 @@ DEFPKGS = NULL
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkpo instdirs
+ @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
@gzip -9f $(top_builddir)/library/grDevices/afm/*.afm
@@ -23,7 +23,7 @@ DEFPKGS = NULL
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc mkdemos mkpo mkfigs
+ @$(MAKE) mkR1 mkdesc mkdemos mkfigs
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -17,7 +17,7 @@ DEFPKGS = NULL
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkdemos mkpo mkfigs
+ @$(MAKE) -f Makefile.win mkR1 mkdesc mkdemos mkfigs
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
@@ -25,7 +25,7 @@ all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) mkR1 mkdesc instdirs mkpo
+ @$(MAKE) mkR1 mkdesc instdirs
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -19,7 +19,7 @@ all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs mkpo
+ @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
@@ -22,7 +22,7 @@ EXTRAS = @BYTE_COMPILE_PACKAGES_TRUE@ R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR2 mkdesc mkpo
+ @$(MAKE) mkR2 mkdesc
@$(MAKE) mksrc
@if test -n "$(R_NO_BASE_COMPILE)"; then \
$(MAKE) RfilesLazy; \
@@ -17,7 +17,7 @@ EXTRAS = R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR2 front mkdesc mkpo
+ @$(MAKE) -f Makefile.win mkR2 front mkdesc
@$(MAKE) -f Makefile.win mksrc-win2
@if test -n "$(R_NO_BASE_COMPILE)"; then \
$(MAKE) -f Makefile.win RfilesLazy; \
@@ -25,7 +25,7 @@ all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) mkR1 mkdesc instdirs mkpo
+ @$(MAKE) mkR1 mkdesc instdirs
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -20,7 +20,7 @@ all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs mkpo mksrc-win2
+ @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
mkR: mkR1
@@ -24,7 +24,7 @@ DEFPKGS = NULL
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc mkpo
+ @$(MAKE) mkR1 mkdesc
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -17,7 +17,7 @@ DEFPKGS = NULL
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkpo
+ @$(MAKE) -f Makefile.win mkR1 mkdesc
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
@@ -26,7 +26,7 @@ DEFPKGS = NULL
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 front mkdesc mkdemos mkpo
+ @$(MAKE) mkR1 front mkdesc mkdemos
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -19,7 +19,7 @@ DEFPKGS = NULL
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 front mkdesc mkdemos mkpo
+ @$(MAKE) -f Makefile.win mkR1 front mkdesc mkdemos
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
@@ -21,7 +21,7 @@ DEFPKGS = "methods,graphics,stats"
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR2 mkdesc mkpo
+ @$(MAKE) mkR2 mkdesc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -16,7 +16,7 @@ DEFPKGS = "methods,graphics,stats"
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR2 mkdesc mkpo
+ @$(MAKE) -f Makefile.win mkR2 mkdesc
@$(MAKE) -f Makefile.win mklazycomp
mkR: mkR2
@@ -36,7 +36,7 @@ all: Makefile DESCRIPTION
fi)
@$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg)
@rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
- @$(MAKE) mkdesc mkexec mkdemos mkpo
+ @$(MAKE) mkdesc mkexec mkdemos
@if test -d src -a @use_tcltk@ = yes; then \
(cd src && $(MAKE)) || exit 1; \
fi
@@ -20,7 +20,7 @@ ifeq "$(BUILD_TCLTK)" "yes"
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkexec mkdemos mkpo
+ @$(MAKE) -f Makefile.win mkR1 mkdesc mkexec mkdemos
@$(MAKE) -f Makefile.win mksrc-win2
@$(MAKE) -f Makefile.win mklazycomp
else
@@ -29,7 +29,7 @@ update:
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc2 mkpo
+ @$(MAKE) mkR1 mkdesc2
@$(MAKE) mksrc
@if ! test -f $(top_builddir)/library/$(pkg)/R/$(pkg); then \
$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \
@@ -17,7 +17,7 @@ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R`
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc2 mkpo mksrc-win2
+ @$(MAKE) -f Makefile.win mkR1 mkdesc2 mksrc-win2
@if ! test $(top_builddir)/library/$(pkg)/R/$(pkg) -nt all.R; then \
$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \
fi
@@ -27,7 +27,7 @@ all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) mkR1 mkdesc mkpo instdirs iconvlist
+ @$(MAKE) mkR1 mkdesc instdirs iconvlist
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@@ -20,7 +20,7 @@ all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/doc
- @$(MAKE) -f Makefile.win mkR1 mkdesc mkpo instdirs
+ @$(MAKE) -f Makefile.win mkR1 mkdesc instdirs
@$(MAKE) -f Makefile.win mklazycomp
include $(top_srcdir)/share/make/basepkg.mk

0 comments on commit e6f3757

Please sign in to comment.