aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-12-22 10:51:00 -0800
committerGlenn Morris2012-12-22 10:51:00 -0800
commit19e9f4352e73b422ffc6a93dd127e27a44852356 (patch)
treee1e2ba6fe01bbc55c3bfe7dc6cf0bcd7177924fc
parentf99f164170af8b7ee84bb229da6ec17b1df7c7bd (diff)
downloademacs-19e9f4352e73b422ffc6a93dd127e27a44852356.tar.gz
emacs-19e9f4352e73b422ffc6a93dd127e27a44852356.zip
Add doclicense.texi dependency for doc/lispintro Makefile
* doc/lispintro/Makefile.in (srcs): New variable, adding doclicense.texi. (${buildinfodir}/eintr$(INFO_EXT), emacs-lisp-intro.dvi) (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $srcs for dependencies.
-rw-r--r--doc/lispintro/ChangeLog7
-rw-r--r--doc/lispintro/Makefile.in10
2 files changed, 13 insertions, 4 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 396e3857c58..b668e965ed8 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,10 @@
12012-12-22 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (srcs): New variable, adding doclicense.texi.
4 (${buildinfodir}/eintr$(INFO_EXT), emacs-lisp-intro.dvi)
5 (emacs-lisp-intro.pdf, emacs-lisp-intro.html):
6 Use $srcs for dependencies.
7
12012-10-24 Paul Eggert <eggert@penguin.cs.ucla.edu> 82012-10-24 Paul Eggert <eggert@penguin.cs.ucla.edu>
2 9
3 * emacs-lisp-intro.texi (Files List): 10 * emacs-lisp-intro.texi (Files List):
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 3f2fe1f9526..0e712e0affb 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -43,6 +43,8 @@ ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
43 43
44mkinfodir = @${MKDIR_P} ${buildinfodir} 44mkinfodir = @${MKDIR_P} ${buildinfodir}
45 45
46srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi
47
46.PHONY: info dvi html pdf ps 48.PHONY: info dvi html pdf ps
47 49
48info: ${buildinfodir}/eintr$(INFO_EXT) 50info: ${buildinfodir}/eintr$(INFO_EXT)
@@ -55,20 +57,20 @@ ps: emacs-lisp-intro.ps
55# The file name eintr must fit within 5 characters, to allow for 57# The file name eintr must fit within 5 characters, to allow for
56# -NN extensions to fit into DOS 8+3 limits without clashing. 58# -NN extensions to fit into DOS 8+3 limits without clashing.
57# Note: "<" is not portable in ordinary make rules. 59# Note: "<" is not portable in ordinary make rules.
58${buildinfodir}/eintr$(INFO_EXT): ${srcdir}/emacs-lisp-intro.texi 60${buildinfodir}/eintr$(INFO_EXT): ${srcs}
59 $(mkinfodir) 61 $(mkinfodir)
60 $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi 62 $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
61 63
62emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi 64emacs-lisp-intro.dvi: ${srcs}
63 $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi 65 $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
64 66
65emacs-lisp-intro.ps: emacs-lisp-intro.dvi 67emacs-lisp-intro.ps: emacs-lisp-intro.dvi
66 $(DVIPS) -o $@ emacs-lisp-intro.dvi 68 $(DVIPS) -o $@ emacs-lisp-intro.dvi
67 69
68emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi 70emacs-lisp-intro.pdf: ${srcs}
69 $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi 71 $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
70 72
71emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi 73emacs-lisp-intro.html: ${srcs}
72 $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs-lisp-intro.texi 74 $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs-lisp-intro.texi
73 75
74.PHONY: mostlyclean clean distclean maintainer-clean infoclean 76.PHONY: mostlyclean clean distclean maintainer-clean infoclean