Skip to content
Browse files

Further changes related to recommended packages.

git-svn-id: https://svn.r-project.org/R/trunk@21155 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent e5fac65 commit 3ca2d9e49e538ea001612aef8f27b69877d3d677 hornik committed
Showing with 28 additions and 62 deletions.
  1. +4 −4 Makefile.in
  2. +6 −8 src/library/Makefile.in
  3. +16 −49 src/library/Recommended/Makefile.in
  4. +2 −1 tools/Makefile.in
View
8 Makefile.in
@@ -22,8 +22,7 @@ SUBDIRS_WITH_NO_BUILD = debian
GZIP = --best
-all: Makefile Makeconf R docs
- @cd src/library/Recommended && $(MAKE) $@
+all: Makefile Makeconf R docs @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -74,6 +73,9 @@ help html latex examples: FORCE
-@(cd src/library && $(MAKE) $@)
FORCE:
+stamp-recommended: FORCE
+ -@(cd src/library/Recommended && $(MAKE) $@)
+
install: installdirs
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
@@ -154,8 +156,6 @@ uninstall-dvi uninstall-info uninstall-pdf:
check:
@(cd tests && $(MAKE) $@)
-rsync-recommended:
- @(cd src/library/Recommended && $(MAKE) rsync-update)
reset-recommended:
@(cd src/library/Recommended && rm -f Timestamp && $(MAKE) Timestamp)
View
14 src/library/Makefile.in
@@ -13,7 +13,7 @@ include $(top_builddir)/Makeconf
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in
-SUBDIRS = profile $(R_PKGS)
+SUBDIRS = profile $(R_PKGS) Recommended
PKGS = $(R_PKGS)
@@ -33,7 +33,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
R:
@$(MKINSTALLDIRS) $(top_builddir)/library
- @for pkg in $(SUBDIRS); do \
+ @for pkg in profile $(R_PKGS); do \
(cd $${pkg} && $(MAKE)) || exit 1; \
done
@$(INSTALL_DATA) $(top_srcdir)/doc/html/R.css \
@@ -88,14 +88,12 @@ uninstall:
mostlyclean: clean
clean:
- @for d in $(SUBDIRS); do \
- (cd $${d} && $(MAKE) $@); \
- done
+ @(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
+ for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -f stamp-*
distclean:
- @for d in $(SUBDIRS); do \
- (cd $${d} && $(MAKE) $@); \
- done
+ @(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
+ for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -f Makefile
maintainer-clean: distclean
View
65 src/library/Recommended/Makefile.in
@@ -11,53 +11,32 @@ subdir = src/library/Recommended
include $(top_builddir)/Makeconf
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = Makefile.in
+DISTFILES = Makefile.in .cvsignore
R = $(top_builddir)/bin/R
-## This should probably get configure'd into Makeconf instead
-## It can point to a local mirror if there's no direct CRAN connection
-CRANREC = cran.r-project.org::CRAN/src/contrib/$(VERSION)/Recommended/
-
CLEANFILES = Timestamp
-DISTCLEANFILES = Makefile Timestamp
-
-all: Makefile Timestamp
- @for i in $(R_PKGS_RECOMMENDED); do \
- if test $${i}_*tar.gz -nt Timestamp ; then \
- R_LIBS= $(R) CMD INSTALL $${i}_*tar.gz || exit 1; \
- fi; \
- done
- @touch Timestamp
+DISTCLEANFILES = Makefile
-.SUFFIXES:
-.SUFFIXES: .in
-
-.in:
- @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+all: Makefile @USE_RECOMMENDED_PACKAGES_TRUE@ stamp-recommended
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- @(for f in $(OBJECTS); do \
- echo "$${f}: $(srcdir)/$${f}.in"; \
- done) >> $@
+stamp-recommended: Timestamp
+ @for pkg in $(R_PKGS_RECOMMENDED); do \
+ for file in $(srcdir)/$${pkg}_*.tar.gz; do \
+ if test $${file} -nt Timestamp ; then \
+ R_LIBS= $(R) CMD INSTALL $${file} || exit 1; \
+ fi; \
+ done; \
+ done
+ @touch Timestamp
Timestamp:
@touch $@
@sleep 1
- @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
- find "$(srcdir)" -name '*.tar.gz' -exec cp {} . \; ; \
- fi
- @find . -name '*.tar.gz' -exec touch {} . \;
-
-R: $(OBJECTS)
-$(OBJECTS): $(top_builddir)/config.status
+ @find $(srcdir) -name '*.tar.gz' -exec touch {} . \;
-## Notice that if we can't use -t on rsync because that defeats the
-## purpose of the Timestamp... The -c (checksum first) is also necessary
-## because otherwise all the files get the mtime changed. Sigh.
-rsync-update: Timestamp
- @rsync -rcIzC --delete --exclude=Makefile \
- --exclude=Makefile.in --exclude=Timestamp $(CRANREC) .
+R docs:
install: installdirs
installdirs:
@@ -68,25 +47,13 @@ uninstall:
mostlyclean: clean
clean:
-@test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- -@test "$(BUILDDIR_IS_SRCDIR)" = yes || \
- rm -f *.tar.gz \;
distclean: clean
-@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
- -@test "$(BUILDDIR_IS_SRCDIR)" = yes || \
- rm -f *.tar.gz \;
maintainer-clean: distclean
-distdir: $(DISTFILES) rsync-update
- @for f in $(DISTFILES); do \
+distdir: $(DISTFILES)
+ @for f in $(DISTFILES) `cd $(srcdir) && ls *.tar.gz`; do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
- @for f in *.tar.gz; do \
- test -f $(distdir)/$${f} \
- || ln $${f} $(distdir)/$${f} 2>/dev/null \
- || cp -p $${f} $(distdir)/$${f}; \
- done
-
-## Automagically generated dependencies:
-
View
3 tools/Makefile.in
@@ -29,7 +29,8 @@ DISTFILES = README \
missing \
mkinstalldirs \
move-if-change \
- pkg2tex.pl
+ pkg2tex.pl \
+ rsync-recommended
all: Makefile R

0 comments on commit 3ca2d9e

Please sign in to comment.
Something went wrong with that request. Please try again.