aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2010-10-09 12:39:42 -0700
committerGlenn Morris2010-10-09 12:39:42 -0700
commiteef3ab9443a2cef449d08aa8832f96007fc3a36b (patch)
treef08cd9e732c83470ae86275a12e0ae82de038927 /doc
parent5bd2348590033750c9a69edb4fbce2aa564ef763 (diff)
downloademacs-eef3ab9443a2cef449d08aa8832f96007fc3a36b.tar.gz
emacs-eef3ab9443a2cef449d08aa8832f96007fc3a36b.zip
Use $< in some doc/*/Makefile rules.
* doc/lispref/Makefile.in (srcs): Put elisp.texi first. ($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<. * doc/lispintro/Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi) (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<. * doc/emacs/Makefile.in (EMACSSOURCES): Put emacs.texi first. ($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi) (emacs-xtra.pdf): Use $<.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/Makefile.in12
-rw-r--r--doc/lispintro/ChangeLog3
-rw-r--r--doc/lispintro/Makefile.in8
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/Makefile.in8
6 files changed, 24 insertions, 14 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2082fda3a48..bac01f7d1ce 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
12010-10-09 Glenn Morris <rgm@gnu.org> 12010-10-09 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (EMACSSOURCES): Put emacs.texi first.
4 ($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
5 (emacs-xtra.pdf): Use $<.
6
3 * Makefile.in (infoclean): Remove harmless, long-standing error. 7 * Makefile.in (infoclean): Remove harmless, long-standing error.
4 8
5 * Makefile.in ($(infodir)): Delete rule. 9 * Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 8f23099f668..7a029482161 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -70,8 +70,8 @@ EMACS_XTRA= \
70 $(srcdir)/msdog-xtra.texi 70 $(srcdir)/msdog-xtra.texi
71 71
72EMACSSOURCES= \ 72EMACSSOURCES= \
73 ${srcdir}/emacsver.texi \
74 ${srcdir}/emacs.texi \ 73 ${srcdir}/emacs.texi \
74 ${srcdir}/emacsver.texi \
75 ${srcdir}/doclicense.texi \ 75 ${srcdir}/doclicense.texi \
76 ${srcdir}/gpl.texi \ 76 ${srcdir}/gpl.texi \
77 ${srcdir}/screen.texi \ 77 ${srcdir}/screen.texi \
@@ -135,20 +135,20 @@ pdf: emacs.pdf
135 135
136$(infodir)/emacs: ${EMACSSOURCES} 136$(infodir)/emacs: ${EMACSSOURCES}
137 $(mkinfodir) 137 $(mkinfodir)
138 cd $(srcdir); $(MAKEINFO) emacs.texi -o $@ 138 cd $(srcdir); $(MAKEINFO) $< -o $@
139 139
140emacs.dvi: ${EMACSSOURCES} 140emacs.dvi: ${EMACSSOURCES}
141 $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi 141 $(ENVADD) $(TEXI2DVI) $<
142 142
143emacs.pdf: ${EMACSSOURCES} 143emacs.pdf: ${EMACSSOURCES}
144 $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi 144 $(ENVADD) $(TEXI2PDF) $<
145 145
146 146
147emacs-xtra.dvi: $(EMACS_XTRA) 147emacs-xtra.dvi: $(EMACS_XTRA)
148 $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi 148 $(ENVADD) $(TEXI2DVI) $<
149 149
150emacs-xtra.pdf: $(EMACS_XTRA) 150emacs-xtra.pdf: $(EMACS_XTRA)
151 $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi 151 $(ENVADD) $(TEXI2PDF) $<
152 152
153.PHONY: mostlyclean clean distclean maintainer-clean infoclean 153.PHONY: mostlyclean clean distclean maintainer-clean infoclean
154 154
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index b8d8f1e29b0..a2e5e1a44c3 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,8 @@
12010-10-09 Glenn Morris <rgm@gnu.org> 12010-10-09 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
4 (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
5
3 * Makefile.in (infoclean): Remove harmless, long-standing error. 6 * Makefile.in (infoclean): Remove harmless, long-standing error.
4 7
5 * Makefile.in ($(infodir)): Delete rule. 8 * Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d50bc8bf8ac..7a33190273c 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -50,16 +50,16 @@ pdf: emacs-lisp-intro.pdf
50# -NN extensions to fit into DOS 8+3 limits without clashing. 50# -NN extensions to fit into DOS 8+3 limits without clashing.
51${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi 51${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
52 $(mkinfodir) 52 $(mkinfodir)
53 cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $@ 53 cd $(srcdir); $(MAKEINFO) $< -o $@
54 54
55emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi 55emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
56 $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $^ 56 $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
57 57
58emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi 58emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
59 $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $^ 59 $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
60 60
61emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi 61emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
62 $(MAKEINFO) --html -o $@ $^ 62 $(MAKEINFO) --html -o $@ $<
63 63
64.dvi.ps: 64.dvi.ps:
65 $(DVIPS) $< -o $@ 65 $(DVIPS) $< -o $@
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 187567c67a2..ee8d7502bc5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12010-10-09 Glenn Morris <rgm@gnu.org> 12010-10-09 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (srcs): Put elisp.texi first.
4 ($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.
5
3 * Makefile.in (infoclean): Remove harmless, long-standing error. 6 * Makefile.in (infoclean): Remove harmless, long-standing error.
4 7
5 * Makefile.in ($(infodir)): Delete rule. 8 * Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index ec570e8000b..8a21fa9c08b 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -42,6 +42,7 @@ TEXI2PDF = texi2pdf
42# List of all the texinfo files in the manual: 42# List of all the texinfo files in the manual:
43 43
44srcs = \ 44srcs = \
45 $(srcdir)/elisp.texi \
45 $(emacsdir)/emacsver.texi \ 46 $(emacsdir)/emacsver.texi \
46 $(srcdir)/abbrevs.texi \ 47 $(srcdir)/abbrevs.texi \
47 $(srcdir)/advice.texi \ 48 $(srcdir)/advice.texi \
@@ -56,7 +57,6 @@ srcs = \
56 $(srcdir)/debugging.texi \ 57 $(srcdir)/debugging.texi \
57 $(srcdir)/display.texi \ 58 $(srcdir)/display.texi \
58 $(srcdir)/edebug.texi \ 59 $(srcdir)/edebug.texi \
59 $(srcdir)/elisp.texi \
60 $(srcdir)/errors.texi \ 60 $(srcdir)/errors.texi \
61 $(srcdir)/eval.texi \ 61 $(srcdir)/eval.texi \
62 $(srcdir)/files.texi \ 62 $(srcdir)/files.texi \
@@ -107,13 +107,13 @@ pdf: elisp.pdf
107 107
108$(infodir)/elisp: $(srcs) 108$(infodir)/elisp: $(srcs)
109 $(mkinfodir) 109 $(mkinfodir)
110 cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@ 110 cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
111 111
112elisp.dvi: $(srcs) 112elisp.dvi: $(srcs)
113 $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi 113 $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
114 114
115elisp.pdf: $(srcs) 115elisp.pdf: $(srcs)
116 $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi 116 $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
117 117
118.PHONY: mostlyclean clean distclean maintainer-clean infoclean 118.PHONY: mostlyclean clean distclean maintainer-clean infoclean
119 119