Commit eff29c2d authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Upstream version 3.2.5

parent e845ea25

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

* News are in
- the source doc/NEWS.Rd
- installed R's doc/NEWS and doc/NEWS.pdf
* Details about single subversion (svn) commits are available, e.g., by
svn log https://svn.r-project.org/R/trunk
......@@ -11,7 +11,8 @@ and Administration Manual', an HTML copy of which is available as file
`doc/html/R-admin.html'. Please read that before installing R. But
if you are impatient, read on but please refer to the manual to
resolve any problems. (If you obtained R using Subversion, the manual
is at doc/manual/R-admin.texi.)
is at doc/manual/R-admin.texi and can be read online at
http://cran.r-project.org/manuals.html.)
SIMPLE COMPILATION
......@@ -30,14 +31,13 @@ Then check the built system worked correctly, by
make check
and make the manuals by (as many options as preferred from)
and make the manuals by either or both of
make dvi to create DVI versions
make pdf to create PDF versions
make info to create info files
However, please read the notes in `R-admin.html' about making the
reference manual.
However, please read the notes in `R-admin.html' about paper size and
making the reference manual.
INSTALLATION
......@@ -48,7 +48,6 @@ You do not need to install R to run it: you can run R by the script
For a site-wide installation, use
make install
make install-dvi
make install-info
make install-pdf
......
......@@ -13,27 +13,28 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
BLAS_LIBS = @BLAS_LIBS@
BUILDDIR_IS_SRCDIR = @BUILDDIR_IS_SRCDIR@
## next two for future support of cross-compiling, not actually used
BUILD_CC = @BUILD_CC@
BUILD_R = @BUILD_R@
CC = @CC@
CFLAGS = @CFLAGS@
CFLAGS = @CFLAGS@ @LTO@
CPICFLAGS = @CPICFLAGS@
CPPFLAGS = @CPPFLAGS@
CURL_CPPFLAGS = @CURL_CPPFLAGS@
CURL_LIBS = @CURL_LIBS@
## in case we want to link with this for UBSAN checks
CXX = @CXX@
DEFS = @DEFS@ @R_DEFS@
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)" --exclude="*~"
DVIPS = @DVIPS@
DYLIB_EXT = @DYLIB_EXT@
DYLIB_LD = @DYLIB_LD@
DYLIB_LDFLAGS = @DYLIB_LDFLAGS@
DYLIB_LDFLAGS = @DYLIB_LDFLAGS@@BUILD_LTO_TRUE@ $(DYLIBS_LTO)
DYLIB_LINK = $(DYLIB_LD) $(DYLIB_LDFLAGS) $(LDFLAGS)
DYLIBS_LTO = $(CFLAGS) $(CPICFLAGS)
ECHO = echo
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
FFLAGS = @FFLAGS@
FFLAGS = @FFLAGS@ @LTO@
FLIBS = @FLIBS@
FLIBS_IN_SO = $(FLIBS)
FLIBS_IN_SO = @FLIBS_IN_SO@
FPICFLAGS = @FPICFLAGS@
F77 = @F77@
GETWD = @GETWD@
......@@ -43,36 +44,37 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DIR = ${INSTALL} -d
JAVA = @JAVA@
JAVA_HOME = @JAVA_HOME@
JAVA_LD_LIBRARY_PATH = @JAVA_LD_LIBRARY_PATH@
JAVA_LIBS = @JAVA_LIBS0@
JAVAC = @JAVAC@
LATEX = @LATEX@
LDFLAGS = @LDFLAGS@
LIBINTL= @LIBINTL@
LIBM = @LIBM@
LIBR = @LIBR@
LIBR0 = @LIBR0@
LIBR1 = @LIBR1@
LIBR = @LIBR0@ @LIBR1@
## These are the libs which the final R.bin/libR is linked against.
## Many of these used to be optional: ICU libs still are.
## There may be platform-specific ones, e.g.
## -lrt -ldl on Linux, -lnsl -lsocket -lrt -lsunmath -ldl -liconv on Solaris.
LIBS = @LIBS@
LIBnn = @LIBnn@
LIBTOOL = @LIBTOOL@
## AFAICS unused
LN_S = @LN_S@
MAIN_CFLAGS = @MAIN_CFLAGS@
MAIN_FFLAGS = @MAIN_FFLAGS@
MAIN_LD = @MAIN_LD@
MAIN_LD = @MAIN_LD@@BUILD_LTO_TRUE@ $(CFLAGS)
MAIN_LDFLAGS = @MAIN_LDFLAGS@ @WANT_R_SHLIB_FALSE@ @USE_EXPORTFILES_TRUE@ -Wl,-bE:$(top_builddir)/etc/R.exp
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LIBR0) $(LDFLAGS)
## need this for bootstrapping
MKINSTALLDIRS = @R_SHELL@ $(top_srcdir)/src/scripts/mkinstalldirs.in
NOTANGLE = @NOTANGLE@
OBJC = @OBJC@
OBJCFLAGS = @OBJCFLAGS@
R_ARCH = @R_ARCH@
R_DYLIB_EXT = @R_DYLIB_EXT@
R_FRAMEWORK_DIR = $(prefix)/R.framework
R_GZIPCMD = @R_GZIPCMD@
## needed for AIX only
@USE_EXPORTFILES_TRUE@ R_HOME = $(top_builddir)
R_OPENMP_CFLAGS = @R_OPENMP_CFLAGS@
## if ever used, need to check that this is compatible with C OpenMP
R_OPENMP_FFLAGS = @R_OPENMP_FFLAGS@
R_OSTYPE = @R_OSTYPE@
R_PKGS = $(R_PKGS_BASE) @USE_RECOMMENDED_PACKAGES_TRUE@ $(R_PKGS_RECOMMENDED)
......@@ -89,8 +91,9 @@ SHLIB_EXT = @SHLIB_EXT@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_FFLAGS = @SHLIB_FFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@@BUILD_LTO_TRUE@ $(SHLIB_LTO)
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LIBR0) $(LDFLAGS)
SHLIB_LTO = $(CFLAGS) $(CPICFLAGS)
STRIP_LIBS = @striplib@
STRIP_STATIC_LIBS = @stripstaticlib@
TAR = @TAR@
......@@ -103,8 +106,8 @@ YACC = @YACC@
ALL_CFLAGS = $(R_XTRA_CFLAGS) $(R_OPENMP_CFLAGS) $(MAIN_CFLAGS) $(CFLAGS)
ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS)
## R_OPENMP_FFLAGS should not really be here: see above
ALL_FFLAGS = $(R_XTRA_FFLAGS) $(R_OPENMP_FFLAGS) $(MAIN_FFLAGS) $(FFLAGS)
ALL_OBJCFLAGS = $(R_XTRA_OBJCFLAGS) $(MAIN_OBJCFLAGS) $(OBJCFLAGS)
ALL_CFLAGS_LO = $(R_XTRA_CFLAGS) $(R_OPENMP_CFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(CFLAGS)
ALL_FFLAGS_LO = $(R_XTRA_FFLAGS) $(R_OPENMP_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
......@@ -114,7 +117,6 @@ ALL_FFLAGS_LO = $(R_XTRA_FFLAGS) $(R_OPENMP_FFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS)
@r_cc_rules_frag@
.f.o:
$(F77) $(ALL_FFLAGS) -c $< -o $@
@r_objc_rules_frag@
prefix = @prefix@
exec_prefix = @exec_prefix@
......
This diff is collapsed.
......@@ -9,18 +9,19 @@ top_builddir = .
include $(top_builddir)/Makeconf
GIT = `if [ -d "$(top_builddir)/.git" ]; then echo "git"; fi`
distdir = $(PACKAGE)-$(VERSION)
INSTFILES = COPYING
## plus NEWS and NEWS.pdf, but need to wait until they are generated
NON_SVN_INSTFILES = SVN-REVISION
DISTFILES = $(INSTFILES) \
ChangeLog INSTALL ONEWS OONEWS README VERSION \
ChangeLog INSTALL README VERSION VERSION-NICK \
Makeconf.in Makefile.in Makefile.fw \
config.site configure configure.ac
SUBDIRS = m4 tools doc etc share src tests @USE_NLS_TRUE@ po
SUBDIRS_WITH_NO_BUILD = @USE_NLS_FALSE@ po
SUBDIRS = m4 tools doc etc share src tests
SUBDIRS_WITH_NO_BUILD = po
all: Makefile Makeconf R docs recommended
all: Makefile Makeconf R docs recommended vignettes javaconf
recommended: @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
......@@ -29,15 +30,18 @@ Makeconf: $(srcdir)/Makeconf.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $@
ACLOCAL_M4 = aclocal.m4
## NB: this is duplicated in m4/Makefile.in
ACINCLUDE_DEPENDENCIES = \
m4/R.m4 \
m4/bigendian.m4 \
m4/cairo.m4 \
m4/clibs.m4 \
m4/codeset.m4 \
m4/cxx_11.m4 \
m4/gettext.m4 m4/gettext-lib.m4 \
m4/java.m4 \
m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 m4/ltsugar.m4 m4/lt~obsolete.m4
m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 m4/ltsugar.m4 m4/lt~obsolete.m4 \
m4/openmp.m4 \
m4/stat-time.m4
CONFIGURE_DEPENDENCIES = $(srcdir)/VERSION
config.status: $(srcdir)/configure
@$(SHELL) ./config.status --recheck
......@@ -72,9 +76,21 @@ FORCE:
stamp-recommended: R docs
@(cd src/library/Recommended && $(MAKE))
## One of the grid vignettes requires lattice
vignettes: stamp-recommended
@(cd src/library && $(MAKE) $@)
## This needs packages built, hence 'R' dependence on 'javaconf'
## javareconf gets remade often.
stamp-java : etc/javaconf $(srcdir)/src/scripts/javareconf.in
@WANT_JAVA_TRUE@ @$(ECHO) "configuring Java ..."
@WANT_JAVA_TRUE@ @-bin/R CMD javareconf
@touch stamp-java
javaconf: R
@$(MAKE) stamp-java
install install-strip: installdirs svnonly
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
......@@ -82,7 +98,7 @@ install install-strip: installdirs svnonly
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(DESTDIR)$(rhome)"; \
done
@for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES); do \
@for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $${f} "$(DESTDIR)$(rhome)"; \
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) -f $(srcdir)/Makefile.fw top_srcdir=$(top_srcdir) $@
......@@ -91,9 +107,13 @@ svnonly:
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || $(ECHO) "Revision: unknown") 2> /dev/null \
(cd $(srcdir); LC_ALL=C TZ=GMT $(GIT) svn info || $(ECHO) "Revision: -99") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
| cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
if test "`cat SVN-REVISION-tmp`" = "Revision: -99"; then \
$(ECHO) "ERROR: not an svn checkout"; \
exit 1; \
fi; \
$(SHELL) $(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \
rm -f SVN-REVISION-tmp ; \
else \
......@@ -104,25 +124,28 @@ svnonly:
fi \
fi
libR_la = lib/libR$(DYLIB_EXT)
@WANT_R_STATIC_FALSE@libR_la = libR$(R_DYLIB_EXT)
@WANT_R_STATIC_TRUE@libR_la = libR.a
install-libR:
@if test -f $(libR_la); then $(MAKE) install-libR-exists; fi
@if test -f lib$(R_ARCH)/$(libR_la); then $(MAKE) install-libR-exists; fi
install-libR-exists:
@$(MKINSTALLDIRS) "$(DESTDIR)${libdir}"
@$(INSTALL_DATA) -m755 $(libR_la) "$(DESTDIR)${libdir}"
@$(INSTALL_DATA) -m755 lib$(R_ARCH)/$(libR_la) "$(DESTDIR)${libdir}"
uninstall-libR:
@rm -f "$(DESTDIR)${libdir}/$(libR_la)"
installdirs:
@$(MKINSTALLDIRS) "$(DESTDIR)$(rhome)"
uninstall:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
@for f in NEWS NEWS.pdf $(INSTFILES) $(NON_SVN_INSTFILES); do \
@for f in $(INSTFILES) $(NON_SVN_INSTFILES); do \
rm -f "$(DESTDIR)$(rhome)/$${f}"; \
done
@rm -rf "$(DESTDIR)$(Rexecbindir)" "$(DESTDIR)$(rhome)/lib"
@rmdir "$(DESTDIR)$(rhome)" 2>/dev/null \
|| $(ECHO) " dir $(DESTDIR)$(rhome) not removed"
@rm -f "$(DESTDIR)${libdir}/libR$(DYLIB_EXT)"
@rm -f "$(DESTDIR)${libdir}/libR$(R_DYLIB_EXT)"
mostlyclean: clean
clean:
......@@ -134,16 +157,18 @@ clean:
distclean: clean
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
@rm -f po/Makefile
-@rm -rf bin include lib library modules gnome
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) NEWS NEWS.pdf non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html doc/html/NEWS.html; \
rm -f $(NON_SVN_INSTFILES) non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html doc/html/NEWS.html; \
fi
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(NON_SVN_INSTFILES); \
rm -rf $(SUBDIRS) $(SUBDIRS_WITH_NO_BUILD); \
fi
-@rm -rf libconftest.dSYM
-@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool \