Permalink
Browse files

Improve automatic remaking.

git-svn-id: https://svn.r-project.org/R/trunk@8452 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 40848a4 commit e6f219c01fcaf4cdd527198f68c2c9f0f68f5a32 hornik committed Mar 6, 2000
Showing with 14 additions and 10 deletions.
  1. +4 −8 Makefile.in
  2. +1 −0 configure
  3. +1 −0 configure.in
  4. +8 −2 src/include/Makefile.in
View
@@ -23,16 +23,16 @@ GZIP = --best
all: Makefile Makeconf R docs
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
+ @cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
Makeconf: $(srcdir)/Makeconf.in $(top_builddir)/config.status
- cd $(top_builddir) \
+ @cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
config.status: $(srcdir)/configure
- $(SHELL) ./config.status --recheck
+ @$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
- cd $(srcdir) && autoconf
+ @cd $(srcdir) && autoconf
R:
@if [ "$(srcdir)" != "." ]; then \
@@ -47,10 +47,6 @@ R:
echo "you should \`make docs' now ..."; \
fi
-src/include/config.h: $(srcdir)/configure \
- $(srcdir)/src/include/config.h.in
- $(top_srcdir)/configure --srcdir $(top_srcdir) @config_opts@
-
docs help html latex examples:: FORCE
-@(cd src/library && $(MAKE) $@)
FORCE:
View
@@ -7349,5 +7349,6 @@ chmod +x \
tools/keyword-test \
tools/keywords2html \
tools/pkg2tex
+ echo timestamp > src/include/stamp-h
View
@@ -771,6 +771,7 @@ AC_OUTPUT_COMMANDS(
tools/keyword-test \
tools/keywords2html \
tools/pkg2tex
+ echo timestamp > src/include/stamp-h
)
if test -z "${F77}"; then
View
@@ -47,7 +47,13 @@ R: Makefile Rconfig.h Rversion.h FFDecl.h FFTab.h
config.h: $(top_srcdir)/configure $(srcdir)/config.h.in
@cd $(top_builddir) && $(MAKE) src/include/config.h
- @touch $@
+
+src/include/config.h: stamp-h
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @cd $(top_builddir) && \
+ CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h \
+ $(SHELL) ./config.status
+ echo > $@
Rconfig.h: $(top_srcdir)/VERSION config.h
@$(top_srcdir)/tools/GETCONFIG > $@
Rversion.h: $(top_srcdir)/VERSION $(top_srcdir)/date-stamp
@@ -60,7 +66,7 @@ mostlyclean:
clean:
@rm -f Rconfig.h Rversion.h FFDecl.h FFTab.h
distclean:
- @rm -f Makefile config.h
+ @rm -f Makefile config.h stamp-h
maintainer-clean: distclean
install install-strip uninstall::

0 comments on commit e6f219c

Please sign in to comment.