Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

make install-strip

git-svn-id: https://svn.r-project.org/R/trunk@40399 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit eeb852337fe792d5c8f862c0e6931b7d2e6a3b4e 1 parent 0392ea0
ripley authored
View
4 Makefile.in
@@ -74,7 +74,7 @@ stamp-recommended: R docs
vignettes: stamp-recommended
@(cd src/library && $(MAKE) $@)
-install: installdirs svnonly
+install install-strip: installdirs svnonly
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
@@ -121,8 +121,6 @@ install-libR-exists:
installdirs:
@$(MKINSTALLDIRS) "$(rhome)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
uninstall:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
View
4 NEWS
@@ -299,6 +299,10 @@ INSTALLATION
o Added workaround for reported non-POSIX sh on OSF1. (PR#9375)
+ o 'make install-strip' now works, stripping the executables and
+ also the shared libraries and modules on platforms where
+ 'libtool' knows how to do so.
+
C-LEVEL FACILITIES
View
7 doc/manual/R-admin.texi
@@ -580,6 +580,13 @@ make prefix=/path/to/here install-libR
where @code{prefix} is optional, and @code{libdir} will give more
precise control.
+@example
+make install-strip
+@end example
+
+@noindent
+will install stripped executables, and on platforms where this is
+supported, stripped libraries in directories @file{lib} and @file{modules}.
@cindex Manuals, installing
View
4 src/extra/Makefile.in
@@ -46,12 +46,12 @@ distclean: clean
-@rm -f Makefile
maintainer-clean: distclean
-install:
+install install-strip:
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
-install-strip uninstall TAGS info dvi check:
+uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
View
11 src/extra/blas/Makefile.in
@@ -40,6 +40,13 @@ Rblas_install: $(Rblas_la)
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rblas_la) \
$(Rexeclibdir)/$(Rblas_la)
+Rblas_install-strip: $(Rblas_la)
+ @$(MKINSTALLDIRS) $(Rexeclibdir)
+ @$(INSTALL) $(Rblas_la) $(Rexeclibdir)/$(Rblas_la)
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexeclibdir)/$(Rblas_la)" ;\
+ fi
+
mostlyclean: clean
clean:
@-rm -f *.o $(Rblas_la)
@@ -48,7 +55,9 @@ distclean: clean
maintainer-clean: distclean
install: @BLAS_SHLIB_TRUE@ Rblas_install
-install-strip uninstall TAGS info dvi check:
+install-strip: @BLAS_SHLIB_TRUE@ Rblas_install-strip
+
+uninstall TAGS info dvi check:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in Makefile.win Rblas.def \
View
2  src/library/Makefile.in
@@ -115,7 +115,7 @@ install: installdirs
installdirs:
@$(MKINSTALLDIRS) "$(rhome)/library"
install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+ @$(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
uninstall:
@echo "uninstalling packages ..."
@(cd "$(rhome)/library"; \
View
8 src/main/Makefile.in
@@ -189,8 +189,12 @@ install-bin: installdirs
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(R_binary) "$(Rexecbindir2)/R"
install-lib: installdirs
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(libR_la) "$(Rexeclibdir)/$(libR_la)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+install-strip: installdirs
+ @${INSTALL_PROGRAM} -s $(R_binary) "$(Rexecbindir2)/R"
+ @if test -f $(libR_la); then $(MAKE) install-lib; fi
+ @if test -n "$(STRIP_LIBS)"; then \
+ if test -f $(libR_la); then $(STRIP_LIBS) "$(Rexeclibdir)/$(libR_la)"; fi; \
+ fi
uninstall:
@rm -f "$(Rexecbindir)/exec/$(R_ARCH)/R" "$(Rexecbindir)/R.bin"
@rm -f "$(Rexeclibdir)/libR$(DYLIB_EXT)"
View
7 src/modules/X11/Makefile.in
@@ -54,8 +54,11 @@ install: installdirs
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(R_X11_la) "$(Rexecmodulesdir)/$(R_X11_la)"
installdirs:
@$(MKINSTALLDIRS) "$(Rexecmodulesdir)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+install-strip: installdirs
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(R_X11_la) "$(Rexecmodulesdir)/$(R_X11_la)"
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexecmodulesdir)/$(R_X11_la)" ;\
+ fi
uninstall:
@rm -f "$(Rexecmodulesdir)/R_X11$(SHLIB_EXT)"
View
7 src/modules/internet/Makefile.in
@@ -52,8 +52,11 @@ install: installdirs
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(internet_la) "$(Rexecmodulesdir)/$(internet_la)"
installdirs:
@$(MKINSTALLDIRS) "$(Rexecmodulesdir)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+install-strip: installdirs
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(internet_la) "$(Rexecmodulesdir)/$(internet_la)"
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexecmodulesdir)/$(internet_la)" ;\
+ fi
uninstall:
@rm -f "$(Rexecmodulesdir)/$(internet_la)"
View
12 src/modules/lapack/Makefile.in
@@ -90,8 +90,16 @@ install: installdirs
@USE_EXTERNAL_LAPACK_FALSE@ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) "$(Rexeclibdir)/$(Rlapack_la)"
installdirs:
@$(MKINSTALLDIRS) "$(Rexecmodulesdir)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+install-strip-Rlapack:
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) "$(Rexeclibdir)/$(Rlapack_la)"
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexeclibdir)/$(Rlapack_la)"; \
+ fi
+install-strip: @USE_EXTERNAL_LAPACK_FALSE@ install-strip-Rlapack
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(lapack_la) "$(Rexecmodulesdir)/$(lapack_la)"
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexecmodulesdir)/$(lapack_la)"; \
+ fi
uninstall:
@rm -f "$(Rexecmodulesdir)/$(lapack_la)"
View
7 src/modules/vfonts/Makefile.in
@@ -53,8 +53,11 @@ install: installdirs
@$(SHELL) $(top_srcdir)/tools/copy-if-change $(vfonts_la) "$(Rexecmodulesdir)/$(vfonts_la)"
installdirs:
@$(MKINSTALLDIRS) "$(Rexecmodulesdir)"
-install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+install-strip: installdirs
+ @$(SHELL) $(top_srcdir)/tools/copy-if-change $(vfonts_la) "$(Rexecmodulesdir)/$(vfonts_la)"
+ @if test -n "$(STRIP_LIBS)"; then \
+ $(STRIP_LIBS) "$(Rexecmodulesdir)/$(vfonts_la)" ;\
+ fi
uninstall:
@rm -f "$(Rexecmodulesdir)/vfonts$(SHLIB_EXT)"
View
7 src/scripts/Makefile.in
@@ -30,6 +30,7 @@ all: Makefile R
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+## why do we use INSTALL_SCRIPT here, and cp/chmod for $(bindir)/R ?
R: $(SCRIPTS_B) R.fe
@$(MAKE) rhome=$(top_builddir) install-cmds
@$(INSTALL_SCRIPT) R.fe $(top_builddir)/bin/R
@@ -98,8 +99,8 @@ install: installdirs install-cmds
@(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \
sed -e "s/\\(R_HOME_DIR=\\).*/\\1$${d}/;" -e "s+\\(R_SHARE_DIR=\\).*+\\1$(rsharedir)+;" -e "s+\\(R_INCLUDE_DIR=\\).*+\\1$(rincludedir)+;" -e "s+\\(R_DOC_DIR=\\).*+\\1$(rdocdir)+;"\
< R.fe > "$(Rexecbindir)/R")
- @cp "$(Rexecbindir)/R" $(bindir)/R
- @chmod 755 $(bindir)/R "$(Rexecbindir)/R"
+ @cp "$(Rexecbindir)/R" "$(bindir)/R"
+ @chmod 755 "$(bindir)/R" "$(Rexecbindir)/R"
installdirs:
@$(MKINSTALLDIRS) $(bindir)
install-cmds:
@@ -112,7 +113,7 @@ install-cmds:
done
@$(INSTALL_SCRIPT) $(top_builddir)/libtool "$(Rexecbindir)"
install-strip:
- $(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+ @$(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
uninstall:
@for f in $(SCRIPTS_S) $(SCRIPTS_B) libtool R; do \
rm -f "$(Rexecbindir)/$${f}"; \
View
10 src/unix/Makefile.in
@@ -69,13 +69,17 @@ install-Rscript:
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
$(srcdir)/Rscript.c
@$(MKINSTALLDIRS) "$(Rexecbindir)"
- @$(SHELL) $(top_srcdir)/tools/copy-if-change Rscript "$(Rexecbindir)/Rscript"
+ @$(INSTALL_PROGRAM) Rscript "$(Rexecbindir)/Rscript"
install: install-Rscript
- @cp Rscript "$(bindir)/Rscript"
+ @$(MKINSTALLDIRS) "$(bindir)"
+ @$(INSTALL_PROGRAM) Rscript "$(bindir)/Rscript"
uninstall:
@rm -f "$(bindir)/Rscript" "$(Rexecbindir)/Rscript"
-install-strip TAGS info dvi check:
+install-strip:
+ @$(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
+
+TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
Please sign in to comment.
Something went wrong with that request. Please try again.