Permalink
Browse files

Misc Makefile cleanups: FIXME, NOTE, quoting, and so on.

git-svn-id: https://svn.r-project.org/R/trunk@18626 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 4583a2a commit f7688be55fbea50108a45e8c75bb0b87ab6fc161 hornik committed Mar 10, 2002
Showing with 194 additions and 180 deletions.
  1. +5 −6 Makefile.in
  2. +1 −1 afm/Makefile.in
  3. +2 −2 doc/Makefile.in
  4. +7 −7 doc/html/Makefile.in
  5. +9 −6 doc/html/search/Makefile.in
  6. +23 −21 doc/manual/Makefile.in
  7. +5 −2 etc/Makefile.in
  8. +1 −1 m4/Makefile.in
  9. +1 −1 share/Makefile.in
  10. +1 −1 src/Makefile.in
  11. +6 −4 src/appl/Makefile.in
  12. +3 −3 src/extra/Makefile.in
  13. +6 −3 src/include/Makefile.in
  14. +5 −2 src/include/R_ext/Makefile.in
  15. +3 −3 src/library/Makefile.in
  16. +2 −2 src/library/base/Makefile.in
  17. +2 −2 src/library/ctest/Makefile.in
  18. +1 −1 src/library/ctest/src/Makefile.in
  19. +2 −2 src/library/eda/Makefile.in
  20. +2 −2 src/library/lqs/Makefile.in
  21. +4 −4 src/library/methods/Makefile.in
  22. +2 −2 src/library/modreg/Makefile.in
  23. +1 −1 src/library/modreg/src/Makefile.in
  24. +2 −2 src/library/mva/Makefile.in
  25. +1 −1 src/library/mva/src/Makefile.in
  26. +2 −2 src/library/nls/Makefile.in
  27. +5 −3 src/library/profile/Makefile.in
  28. +2 −2 src/library/splines/Makefile.in
  29. +2 −2 src/library/stepfun/Makefile.in
  30. +2 −2 src/library/tcltk/Makefile.in
  31. +2 −2 src/library/tools/Makefile.in
  32. +2 −2 src/library/ts/Makefile.in
  33. +1 −1 src/library/ts/src/Makefile.in
  34. +11 −11 src/main/Makefile.in
  35. +0 −2 src/modules/Makefile.in
  36. +5 −9 src/modules/X11/Makefile.in
  37. +5 −9 src/modules/gnome/Makefile.in
  38. +5 −4 src/modules/internet/Makefile.in
  39. +6 −5 src/modules/lapack/Makefile.in
  40. +5 −4 src/modules/vfonts/Makefile.in
  41. +4 −2 src/nmath/Makefile.in
  42. +2 −2 src/nmath/standalone/Makefile.in
  43. +9 −7 src/scripts/Makefile.in
  44. +1 −1 src/unix/Makefile.in
  45. +3 −3 tests/Embedding/Makefile.in
  46. +4 −4 tests/Examples/Makefile.in
  47. +18 −18 tests/Makefile.in
  48. +1 −1 tools/Makefile.in
View
@@ -63,7 +63,7 @@ R: Makefile
(cd $${d} && $(MAKE) R) || exit 1; \
done
@if [ ! -f src/library/stamp-docs ]; then \
- echo "you should \`make docs' now ..."; \
+ echo "you should 'make docs' now ..."; \
fi
docs: FORCE
@@ -104,15 +104,14 @@ clean:
distclean: clean
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
- @rm -rf bin include library modules gnome
- @rm -f Makeconf Makefile Makefile.bak Makefrag.* \
+ -@rm -rf bin include library modules gnome
+ -@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool
-## FIXME:
-## This should really do something!
maintainer-clean: distclean
@echo "This command is intended for maintainers to use; it"
@echo "deletes files that may need special rules to rebuild"
-## </FIXME>
+ @(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
+ for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
dist: dist-unix
dist-unix: distdir
View
@@ -66,7 +66,7 @@ clean:
rm -f $(INSTFILES); \
fi
distclean: clean
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
distdir: $(DISTFILES)
View
@@ -82,11 +82,11 @@ distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
@echo "This command is intended for maintainers to use; it"
@echo "deletes files that may need special rules to rebuild"
- @rm -f $(srcdir)/R.1
+ -@rm -f $(srcdir)/R.1
maintainer-build: $(srcdir)/R.1 windocs
$(srcdir)/R.1: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/VERSION $(top_srcdir)/date-stamp $(top_srcdir)/src/scripts/R.sh.in $(srcdir)/R.aux
View
@@ -24,14 +24,14 @@ INSTFILES = \
template.html \
thanks.html
## </FIXME>
-## FIXME:
-## build-help really should not create package.html in *this* directory.
-CLEANFILES = packages.html packages-foot.html
-## </FIXME>
DISTFILES = Makefile.in $(INSTFILES) index-default.html R-admin.html
SUBDIRS = search
-
OBJECTS = index.html
+## <FIXME>
+## build-help really should not create packages.html in *this* directory.
+CLEANFILES = packages.html packages-foot.html $(OBJECTS)
+## </FIXME>
+DISTCLEANFILES = Makefile
all: Makefile R
@@ -87,12 +87,12 @@ clean:
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(INSTFILES); \
fi
- @rm -f $(CLEANFILES) $(OBJECTS)
+ -@test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@); \
done
- @rm -f Makefile
+ -@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean: distclean
distdir: $(DISTFILES)
@@ -26,9 +26,10 @@ INSTFILES = \
SearchObject.html
DISTFILES = Makefile.in $(SOURCES_JAVA) $(INSTFILES)
-OBJECTS = \
- SearchEngine.html \
- index.txt
+OBJECTS = SearchEngine.html index.txt
+
+CLEANFILES = $(OBJECTS)
+DISTCLEANFILES = Makefile
.SUFFIXES:
.SUFFIXES: .class .java
@@ -54,11 +55,13 @@ SearchEngine.html: \
@-$(PERL) $(top_srcdir)/tools/keywords2html.pl \
$(top_srcdir)/doc/KEYWORDS.db >> $@
@cat $(srcdir)/SearchEngine-foot.html >> $@
-## FIXME:
+## <FIXME>
## This is created via
## (cd $(top_builddir)/src/library && make DOCS)
index.txt:
@touch $@
+## so we need to remove it ...
+## </FIXME>
install: install-message installdirs install-sources
@for f in $(OBJECTS); do \
@@ -83,9 +86,9 @@ clean:
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(INSTFILES); \
fi
- @rm -f $(OBJECTS)
+ -@test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean: clean
- @rm -f Makefile
+ -@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean: distclean
distdir: $(DISTFILES)
View
@@ -64,43 +64,44 @@ docs: html
.texi.dvi:
@if test "$(TEX)" = false; then \
- echo "ERROR: \`tex' needed but missing on your system."; \
+ echo "ERROR: 'tex' needed but missing on your system."; \
exit 1; \
fi
TEXINPUTS="$(srcdir):$$TEXINPUTS" $(TEXI2DVI) $<
.texi.html:
$(TEXI2HTML) -I$(srcdir) $< -o $@ || touch $@
.texi.info:
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(MAKEINFO) -D UseExternalXrefs -I$(srcdir) $<
.texi.pdf:
@if test "$(PDFTEX)" = false; then \
- echo "ERROR: \`pdftex' needed but missing on your system."; \
+ echo "ERROR: 'pdftex' needed but missing on your system."; \
exit 1; \
fi
TEXINPUTS="$(srcdir):$$TEXINPUTS" $(TEXI2PDF) $<
dvi: refman.dvi $(OBJECTS_DVI)
refman.dvi: version.tex $(top_srcdir)/share/texmf/Rd.sty stamp-refman-dvi
@if test "$(LATEX)" = false; then \
- echo "ERROR: \`latex' needed but missing on your system."; \
+ echo "ERROR: 'latex' needed but missing on your system."; \
exit 1; \
fi
@echo "DVI/LaTeX documentation: reference index ..."
@rm -f *.aux refman.toc refman.ind stamp-refman-dvi
-## <FIXME>
-## Make sure echo does not interpret backslash escapes.
+## <NOTE>
+## We do not make sure echo does not interpret backslash escapes.
+## Could be trouble ...
@(opt="$${R_PAPERSIZE-$(R_PAPERSIZE)}paper"; \
echo "\\documentclass[$${opt}]{book}"; \
opt="$${R_RD4DVI-$(R_RD4DVI)}"; \
echo "\\usepackage[$${opt}]{Rd}"; \
cat $(srcdir)/refman.top; \
for p in $(R_PKGS); do echo "\\input{$${p}-pkg.tex}"; done; \
cat $(srcdir)/refman.bot) > refman.tex
-## </FIXME>
+## </NOTE>
@TEXINPUTS="$(top_srcdir)/share/texmf:$$TEXINPUTS" \
$(LATEX) '\nonstopmode\input{refman.tex}'
@-$(MAKEINDEX) refman
@@ -118,7 +119,7 @@ $(pkgsrcs): FORCE $(top_srcdir)/share/perl/build-help.pl
@(pkg=`basename $@ -pkg.tex`; \
if $(PERL) $(top_srcdir)/tools/Rdnewer.pl \
"$(top_srcdir)/src/library/$${pkg}" "$@"; then \
- echo "collecting LaTeX docs for package \`$${pkg}' ..."; \
+ echo "collecting LaTeX docs for package '$${pkg}' ..."; \
(cd $(top_builddir)/src/library && \
OPTS="--latex" $(MAKE) R_PKGS="$${pkg}" DOCS); \
$(PERL) $(top_srcdir)/tools/pkg2tex.pl $${pkg}; \
@@ -161,21 +162,22 @@ R-lang.info: $(texiincludes)
pdf: refman.pdf $(OBJECTS_PDF)
refman.pdf: version.tex $(top_srcdir)/share/texmf/Rd.sty stamp-refman-pdf
@if test "$(PDFLATEX)" = false; then \
- echo "ERROR: \`pdflatex' needed but missing on your system."; \
+ echo "ERROR: 'pdflatex' needed but missing on your system."; \
exit 1; \
fi
@echo "PDF/LaTeX documentation: reference index ..."
@rm -f *.aux refman.toc refman.ind stamp-refman-pdf
-## <FIXME>
-## Make sure echo does not interpret backslash escapes.
+## <NOTE>
+## We do not make sure echo does not interpret backslash escapes.
+## Could be trouble ...
@(opt="$${R_PAPERSIZE-$(R_PAPERSIZE)}paper"; \
echo "\\documentclass[$${opt}]{book}"; \
opt="$${R_RD4PDF-$(R_RD4PDF)}"; \
echo "\\usepackage[$${opt}]{Rd}"; \
cat $(srcdir)/refman.top; \
for p in $(R_PKGS); do echo "\\input{$${p}-pkg.tex}"; done; \
cat $(srcdir)/refman.bot) > refman.tex
-## </FIXME>
+## </NOTE>
@TEXINPUTS="$(top_srcdir)/share/texmf:$$TEXINPUTS" \
pool_size=500000 max_strings=50000 \
$(PDFLATEX) '\nonstopmode\input{refman.tex}'
@@ -232,7 +234,7 @@ install-info: info $(infodir)/dir
@for f in $(OBJECTS_INFO:.info=.info*); do \
$(INSTALL_DATA) $${f} $(infodir); \
done
- @echo "updating \`$(infodir)/dir' ..."
+ @echo "updating '$(infodir)/dir' ..."
@for f in $(OBJECTS_INFO); do \
$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$${f} \
|| echo "you need to adjust $(infodir)/dir manually"; \
@@ -276,14 +278,14 @@ clean:
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -rf $(INSTFILES) images; \
fi
- @-rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.html *.info* \
+ -@rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.html *.info* \
*.ky *.kys *.log *.out *.pdf *.pg *.pgs *.ps *.ps-2 *.tmp \
*.toc *.tp *.vr *.vrs \
*-pkg.tex refman.i?? refman.tex version.tex \
version.texi
- @rm -f stamp-*
+ -@rm -f stamp-*
distclean: clean
- @-rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
maintainer-build: \
@@ -294,31 +296,31 @@ maintainer-build: \
$(top_srcdir)/doc/html/R-admin.html
$(top_srcdir)/FAQ: @MAINTAINER_MODE_TRUE@ $(srcdir)/R-FAQ.texi
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(TEXI2TEXT) $(srcdir)/R-FAQ.texi -o $@
$(top_srcdir)/doc/html/faq.html: @MAINTAINER_MODE_TRUE@ $(srcdir)/R-FAQ.texi
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(TEXI2HTML) --number-sections $(srcdir)/R-FAQ.texi -o $@
$(top_srcdir)/RESOURCES: @MAINTAINER_MODE_TRUE@ $(srcdir)/resources.texi
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(TEXI2TEXT) $(srcdir)/resources.texi -o $@
$(top_srcdir)/doc/html/resources.html: @MAINTAINER_MODE_TRUE@ $(srcdir)/resources.texi
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(TEXI2HTML) --no-headers $(srcdir)/resources.texi -o $@
$(top_srcdir)/doc/html/R-admin.html: @MAINTAINER_MODE_TRUE@ $(srcdir)/R-admin.texi $(texiincludes)
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: \`makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
exit 1; \
fi
$(TEXI2HTML) --no-headers --number-sections -I$(srcdir) \
View
@@ -17,6 +17,9 @@ DISTFILES = Makefile.in $(SOURCES)
EXPORTFILE = @USE_EXPORTFILE_TRUE@ R.exp
+CLEANFILES = $(EXPORTFILE)
+DISTCLEANFILES = $(OBJECTS) Makefile
+
all: Makefile R
.SUFFIXES:
@@ -56,9 +59,9 @@ uninstall:
mostlyclean: clean
clean:
- @-test -z "$(EXPORTFILE)" || rm -f $(EXPORTFILE)
+ -@test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean: clean
- @rm -f $(OBJECTS) Makefile
+ -@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean: distclean
distdir: $(DISTFILES)
View
@@ -29,7 +29,7 @@ R: Makefile
mostlyclean: clean
clean:
distclean: clean
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
install install-strip uninstall TAGS info dvi check:
View
@@ -89,7 +89,7 @@ clean:
rm -rf $(SUBDIRS); \
fi
distclean:
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
distdir: $(DISTFILES)
View
@@ -33,7 +33,7 @@ uninstall mostlyclean clean:
distclean:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
distdir: $(DISTFILES)
View
@@ -10,9 +10,11 @@ subdir = src/appl
include $(top_builddir)/Makeconf
+## <NOTE>
## All functions/subroutines to be called via .C() or .Fortran() must
-## also have an entry in `./ROUTINES' in order to be ``pre-dyn.loaded'';
-## see `../unix/dynload.c'.
+## also have an entry in @file{./ROUTINES} in order to be 'pre-dyn.loaded';
+## see @file{../unix/dynload.c}.
+## </NOTE>
SOURCES_C = \
approx.c \
@@ -49,11 +51,11 @@ noinst_LIBRARIES = libappl.a
libappl_a_SOURCES = $(SOURCES)
libappl_a_OBJECTS = $(OBJECTS)
-## FIXME:
+## <FIXME>
## We most likely will not want a separate shared library.
## If we have a final decision, remove libappl.la target.
-## </FIXME>
noinst_LTLIBRARIES = libappl.la
+## </FIXME>
libappl_la_SOURCES = $(SOURCES)
libappl_la_OBJECTS = $(OBJECTS:.o=.lo)
@USE_LIBTOOL_TRUE@libappl_la_LDFLAGS = -avoid-version -rpath $(Rexeclibdir)
View
@@ -30,14 +30,14 @@ R: Makefile
mostlyclean: clean
clean:
- @list='$(EXTRA_LIBS)'; for d in $${list}; do \
+ @for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
distclean: clean
- @list='$(EXTRA_LIBS)'; for d in $${list}; do \
+ @for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
- @rm -f Makefile
+ -@rm -f Makefile
maintainer-clean: distclean
install install-strip uninstall TAGS info dvi check:
Oops, something went wrong.

0 comments on commit f7688be

Please sign in to comment.