diff options
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 31 | ||||
| -rw-r--r-- | doc/lispintro/Makefile.in | 43 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 6 |
3 files changed, 54 insertions, 26 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index ee3af3ff3d1..1ac7258e85a 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,8 +1,37 @@ -2014-06-29 Glenn Morris <rgm@gnu.org> +2014-07-03 Glenn Morris <rgm@gnu.org> * emacs-lisp-intro.texi (Note for Novices, Finding More, Conclusion): "Online" help doesn't mean what it used to any more. +2014-06-23 Glenn Morris <rgm@gnu.org> + + * Makefile.in (%.texi): Disable implicit rules. + (mkinfodir): Remove. + (.dvi.ps): Replace with explicit rule. + (${buildinfodir}): New rule. + (${buildinfodir}/eintr.info): Use order-only prereq for output dir. + Use $<. + (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): + Use $<. + (emacs-lisp-intro.ps): New rule. + +2014-06-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (bootstrap-clean): New. + +2014-06-10 Glenn Morris <rgm@gnu.org> + + * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. + (INFO_OPTS): Set directly rather than with configure. + +2014-06-02 Glenn Morris <rgm@gnu.org> + + * emacs-lisp-intro.texi (Autoload): Update loaddefs.el details. + +2014-04-17 Paul Eggert <eggert@cs.ucla.edu> + + * Makefile.in (infoclean): Be consistent about reporting failures. + 2014-02-25 Glenn Morris <rgm@gnu.org> * emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index c041cd17e02..b40c26767cc 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -46,9 +46,8 @@ GZIP_PROG = @GZIP_PROG@ HTML_OPTS = --no-split --html -INFO_EXT=@INFO_EXT@ # Options used only when making info output. -INFO_OPTS=@INFO_OPTS@ +INFO_OPTS= --no-split INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -67,42 +66,41 @@ HTML_TARGETS = emacs-lisp-intro.html PDF_TARGETS = emacs-lisp-intro.pdf PS_TARGETS = emacs-lisp-intro.ps -mkinfodir = @${MKDIR_P} ${buildinfodir} - srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \ ${emacsdir}/emacsver.texi -.PHONY: info dvi html pdf ps - -.SUFFIXES: .ps .dvi - -.dvi.ps: - $(DVIPS) -o $@ $< +## Disable implicit rules. +%.texi: ; -info: ${buildinfodir}/eintr$(INFO_EXT) +.PHONY: info dvi html pdf ps +info: ${buildinfodir}/eintr.info dvi: $(DVI_TARGETS) html: $(HTML_TARGETS) pdf: $(PDF_TARGETS) ps: $(PS_TARGETS) +${buildinfodir}: + ${MKDIR_P} $@ + # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. -# Note: "<" is not portable in ordinary make rules. -${buildinfodir}/eintr$(INFO_EXT): ${srcs} - $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi +${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir} + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs-lisp-intro.dvi: ${srcs} - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi + $(ENVADD) $(TEXI2DVI) $< emacs-lisp-intro.pdf: ${srcs} - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi + $(ENVADD) $(TEXI2PDF) $< emacs-lisp-intro.html: ${srcs} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + +emacs-lisp-intro.ps: emacs-lisp-intro.dvi + $(DVIPS) -o $@ $< -.PHONY: mostlyclean clean distclean maintainer-clean infoclean +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean mostlyclean: rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ @@ -116,9 +114,11 @@ distclean: clean rm -f Makefile infoclean: - -cd $(buildinfodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9] + rm -f \ + $(buildinfodir)/eintr.info \ + $(buildinfodir)/eintr.info-[1-9] -maintainer-clean: distclean infoclean +bootstrap-clean maintainer-clean: distclean infoclean .PHONY: dist @@ -134,7 +134,6 @@ dist: -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ - -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 4c85e67f7f3..7ff91758670 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @comment %**start of header -@setfilename ../../info/eintr +@setfilename ../../info/eintr.info @c setfilename emacs-lisp-intro.info @c sethtmlfilename emacs-lisp-intro.html @settitle Programming in Emacs Lisp @@ -17548,8 +17548,8 @@ are not loaded right away; but you need to wait a moment when you first use such a function, while its containing file is evaluated. Rarely used functions are frequently autoloaded. The -@file{loaddefs.el} library contains hundreds of autoloaded functions, -from @code{bookmark-set} to @code{wordstar-mode}. Of course, you may +@file{loaddefs.el} library contains thousands of autoloaded functions, +from @code{5x5} to @code{zone}. Of course, you may come to use a `rare' function frequently. When you do, you should load that function's file with a @code{load} expression in your @file{.emacs} file. |