Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use Make variable 'SUBDIRS_WITH_NO_BUILD' to indicate subdirs where u…

…nder

Unix (and eventually Automake) nothing is built.


git-svn-id: https://svn.r-project.org/R/trunk@19999 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 189bc25979fa9d1167070e1e10eb6ee2f9fa7fca 1 parent 41eb1a7
hornik authored
View
5 Makefile.in
@@ -18,6 +18,7 @@ DISTFILES = $(INSTFILES) \
config.site configure configure.ac \
date-stamp
SUBDIRS = m4 tools afm doc etc share src tests
+SUBDIRS_WITH_NO_BUILD = debian
GZIP = --best
@@ -136,9 +137,9 @@ distdir: $(DISTFILES)
(cd $${d} && $(MAKE) distdir) \
|| exit 1; \
done
- @for d in debian; do \
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
- | (cd $(distdir); $(TAR) -x -f -)) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
18 doc/Makefile.in
@@ -105,16 +105,10 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
- if test -f $${d}/Makefile; then \
- test -d $(distdir)/$${d} \
- || mkdir $(distdir)/$${d} \
- || exit 1; \
- chmod 755 $(distdir)/$${d}; \
- (cd $${d} && $(MAKE) distdir) \
- || exit 1; \
- else \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1; \
- fi; \
+ test -d $(distdir)/$${d} \
+ || mkdir $(distdir)/$${d} \
+ || exit 1; \
+ chmod 755 $(distdir)/$${d}; \
+ (cd $${d} && $(MAKE) distdir) \
+ || exit 1; \
done
View
18 doc/html/Makefile.in
@@ -102,16 +102,10 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
- if test -f $${d}/Makefile; then \
- test -d $(distdir)/$${d} \
- || mkdir $(distdir)/$${d} \
- || exit 1; \
- chmod 755 $(distdir)/$${d}; \
- (cd $${d} && $(MAKE) distdir) \
- || exit 1; \
- else \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1; \
- fi; \
+ test -d $(distdir)/$${d} \
+ || mkdir $(distdir)/$${d} \
+ || exit 1; \
+ chmod 755 $(distdir)/$${d}; \
+ (cd $${d} && $(MAKE) distdir) \
+ || exit 1; \
done
View
12 doc/manual/Makefile.in
@@ -22,7 +22,7 @@ DISTFILES = \
R-exts.R R-exts.c R-intro.R \
refman.top refman.bot \
ISBN
-SUBDIRS = images
+SUBDIRS_WITH_NO_BUILD = images
OBJECTS_DVI = $(SOURCES_TEXI:.texi=.dvi)
OBJECTS_HTML = $(SOURCES_TEXI:.texi=.html)
@@ -333,10 +333,8 @@ distdir: $(DISTFILES)
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
- @for d in $(SUBDIRS); do \
- if test -d $(srcdir)/$${d}; then \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1; \
- fi; \
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
+ || exit 1; \
done
View
19 share/Makefile.in
@@ -14,9 +14,9 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in
## subdirectories of R_HOME/share
-SUBDIRS = R glade make perl sh texmf
+SUBDIRS_WITH_NO_BUILD = R glade make perl sh texmf
## subdirectories of R_HOME/share/perl
-SUBDIRS_PERL = R Text
+SUBDIRS_SHARE_PERL = R Text
GNOME_IF_FILES = @GNOME_IF_FILES@
@@ -42,7 +42,7 @@ installdirs:
fi
@$(MKINSTALLDIRS) $(rhome)/share/make
@$(MKINSTALLDIRS) $(rhome)/share/perl
- @for d in $(SUBDIRS_PERL); do \
+ @for d in $(SUBDIRS_SHARE_PERL); do \
$(MKINSTALLDIRS) $(rhome)/share/perl/$${d}; \
done
@$(MKINSTALLDIRS) $(rhome)/share/sh
@@ -61,7 +61,7 @@ install-sources: installdirs
@for f in $(srcdir)/make/*.mk; do \
$(INSTALL_DATA) $${f} $(rhome)/share/make; \
done
- @for d in $(SUBDIRS_PERL); do \
+ @for d in $(SUBDIRS_SHARE_PERL); do \
for f in $(srcdir)/perl/$${d}/*.pm; do \
$(INSTALL_DATA) $${f} $(rhome)/share/perl/$${d}; \
done; \
@@ -86,7 +86,7 @@ uninstall:
mostlyclean:
clean:
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
- rm -rf $(SUBDIRS); \
+ rm -rf $(SUBDIRS_WITH_NO_BUILD); \
fi
distclean:
-@rm -f Makefile
@@ -98,7 +98,8 @@ distdir: $(DISTFILES)
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
- @((cd $(srcdir); \
- $(TAR) -c -f - --exclude=CVS $(SUBDIRS)) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
+ || exit 1; \
+ done
View
10 src/Makefile.in
@@ -14,6 +14,7 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in
SUBDIRS = scripts include appl nmath unix extra main modules library
+SUBDIRS_WITH_NO_BUILD = gnuwin32 macintosh
all: Makefile R
@@ -50,7 +51,8 @@ distdir: $(DISTFILES)
(cd $${d} && $(MAKE) distdir) \
|| exit 1; \
done
- @((cd $(srcdir); \
- $(TAR) -c -f - --exclude=CVS gnuwin32 macintosh) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
+ || exit 1; \
+ done
View
7 src/extra/Makefile.in
@@ -14,6 +14,8 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in
SUBDIRS = xdr zlib
+SUBDIRS_WITH_NO_BUILD = bzip2 pcre
+
LIBZ = @BUILD_ZLIB_TRUE@ zlib
LIBXDR = @BUILD_XDR_TRUE@ xdr
EXTRA_LIBS = $(LIBZ) $(LIBXDR)
@@ -56,3 +58,8 @@ distdir: $(DISTFILES)
(cd $${d} && $(MAKE) distdir) \
|| exit 1; \
done
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
+ || exit 1; \
+ done
View
10 src/extra/xdr/Makefile.in
@@ -29,7 +29,9 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
## accordingly.
DISTFILES = \
README.txt copyrght.txt Makefile.in Makefile.win $(SOURCES)
+SUBDIRS_WITH_NO_BUILD = rpc
## </FIXME>
+
noinst_LIBRARIES = @BUILD_XDR_TRUE@ libxdr.a
libxdr_a_SOURCES = $(SOURCES)
libxdr_a_OBJECTS = $(OBJECTS)
@@ -70,9 +72,11 @@ distdir: $(DISTFILES)
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
- @((cd $(srcdir); $(TAR) -c -f - --exclude=CVS rpc) \
- | (cd $(distdir); $(TAR) -x -f -)) \
- || exit 1
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ | (cd $(distdir); $(TAR) -x -f -)) \
+ || exit 1; \
+ done
## Automagically generated dependencies:
View
4 src/nmath/Makefile.in
@@ -54,7 +54,7 @@ HEADERS = bessel.h dpq.h nmath.h
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = Makefile.in Makefile.win $(SOURCES) $(HEADERS)
-SUBDIRS = standalone
+SUBDIRS_WITH_NO_BUILD = standalone
noinst_LIBRARIES = libnmath.a
libnmath_a_SOURCES = $(SOURCES)
@@ -110,7 +110,7 @@ distdir: $(DISTFILES)
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
- @for d in $(SUBDIRS); do \
+ @for d in $(SUBDIRS_WITH_NO_BUILD); do \
((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
Please sign in to comment.
Something went wrong with that request. Please try again.