1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Commit graph

66 commits

Author SHA1 Message Date
Chong Yidong
e18afed7d6 Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org 2012-05-14 19:59:28 +08:00
Glenn Morris
beb57c77e4 * doc/misc/Makefile.in (mostlyclean): Add still more TeX intermediates. 2012-05-12 11:04:06 -07:00
Glenn Morris
9598ef0bda * .bzrignore, doc/misc/Makefile.in (mostlyclean): Add more TeX intermediates. 2012-05-12 11:03:18 -07:00
Andreas Schwab
78e91d0834 * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi. 2012-05-12 19:23:16 +02:00
Glenn Morris
7d326a2900 Make doc/misc/Makefile.in look more like the other doc Makefiles
* doc/misc/Makefile.in:
Use explicit $srcdir in all dependencies.
Remove cd $srcdir from rules.
(VPATH): Remove.
(infodir): Set to an absolute path.
(INFO_TARGETS): Use short names.
(mkinfodir): infodir is now absolute.
(echo-info, maintainer-clean): Update for new format of INFO_TARGETS.
2012-05-12 09:44:01 -07:00
Glenn Morris
9583393ff6 * doc/misc/Makefile.in (.SUFFIXES): Disable implicit rules.
Fixes previous change.
2012-05-11 22:05:05 -04:00
Glenn Morris
c7f95930c7 * doc/misc/Makefile.in (info.info): Rename from info, to avoid duplication. 2012-05-11 21:32:19 -04:00
Glenn Morris
3fe7cdc86d Let configure test for a suitable mkdir -p
* configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
(MKDEPDIR): Use $MKDIR_P.

* Makefile.in (MKDIR_P): New, set by configure.
(mkdir): Use $MKDIR_P.

* doc/emacs/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/lispintro/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/lispref/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/misc/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* src/Makefile.in (MKDIR_P): New, set by configure.

* src/ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P.
2012-05-11 20:57:48 -04:00
Glenn Morris
956cceb9b1 * doc/misc/Makefile.in (info): Make it the first target again. 2012-05-04 16:53:03 -04:00
Glenn Morris
8045b9065f Give info files the .info extension
Ref http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00354.html

* configure.in (INFO_EXT, INFO_OPTS): New output variables.

* doc/emacs/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/emacs/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT, and -o.

* doc/lispintro/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
(${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispintro/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS, clean): Use $INFO_EXT.
($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/lispref/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispref/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(info, maintainer-clean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/misc/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.
* doc/misc/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.
2012-05-03 23:45:03 -07:00
Glenn Morris
9aa071dfb9 Don't hard-code the list of info files in the top-level Makefile
The sed '/ing directory/d' piece is to remove the annoying
"entering/leaving directory" messages that GNU make insists on
printing when called recursively.  --no-print-directory isn't portable.

* Makefile.in (INFO_FILES): Remove variable.
(INFO_NONMISC): New variable.
(install-arch-indep, uninstall): Don't use $INFO_FILES.

* doc/misc/Makefile.in (echo-info): New phony target, used by top-level.
2012-05-02 00:45:16 -07:00
Glenn Morris
050bb9b321 * doc/misc/Makefile.in: Replace non-portable use of $< in emacs-gnutls rules. 2012-04-12 20:01:59 -04:00
Teodor Zlatanov
5f9a4e98c0 Backport addition of emacs-gnutls manual from trunk 2012-04-12 19:59:47 -04:00
Glenn Morris
f48a9cb464 Replace non-portable use of $< in ordinary make rules
Ref: http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00074.html

* emacs/Makefile.in, lispintro/Makefile.in, lispref/Makefile.in:
* misc/Makefile.in: Replace non-portable use of $< in ordinary rules.
2012-04-07 12:23:53 -07:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Glenn Morris
a0c52e5d12 * doc/misc/Makefile.in: Fix ert rules.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00224.html
2011-10-08 14:00:41 -07:00
Glenn Morris
b9704ad993 Remove $shortlisp from src/Makefile.in.
* configure.in (lisp_frag): New output file.

* src/lisp.mk: New file, split from Makefile.in, and inheriting its
  copyright years.
* src/Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
(shortlisp): Remove.
($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.

* lisp/loadup.el, doc/misc/Makefile.in: Comment changes.
2011-05-19 17:41:03 -07:00
Glenn Morris
54ce11a161 Some more html rules for doc/misc/Makefile.in.
* doc/misc/Makefile.in (emacs-faq.html): Fix some more cross-refs.
(emacs-faq.text): New target.
(clean): Add emacs-faq.
2011-03-12 10:40:08 -08:00
Glenn Morris
4f1f90cd9d Fix previous change. 2011-03-11 01:07:33 -08:00
Glenn Morris
b740639e32 Add Makefile rules for generating html version of Emacs FAQ.
* doc/misc/Makefile.in (HTML_TARGETS): New.
(clean): Delete $HTML_TARGETS.
(emacs-faq.html): New, for use with the gnu.org Emacs webpage.
2011-03-11 01:02:58 -08:00
Glenn Morris
b322c9aff7 Use emacsver.texi in dired-x.texi.
* doc/misc/dired-x.texi: Use emacsver.texi to get Emacs version.
* doc/misc/Makefile.in ($(infodir)/dired-x, dired-x.dvi, dired-x.pdf):
Depend on emacsver.texi.
2011-02-16 00:46:13 -08:00
Teodor Zlatanov
7fbf7cae66 gnus-overrides.texi: Renamed from overrides.texi and all the relevant manuals use it now.
Makefile.in (nowebhack): Fixed to use -D flag instead of overrides.
2011-02-06 00:25:41 +00:00
Katsumi Yamaoka
156ad271e5 overrides.texi: Remove.
sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.
2011-02-05 12:29:48 +00:00
Katsumi Yamaoka
48fb2ce10a Makefile.in (webhack, nowebhack): New targets that I forgot to merge from Gnus last. 2011-02-05 11:23:52 +00:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Werner LEMBERG
45eb2a5d46 Improve configuration of makeinfo.
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable.  Use it where appropriate.
(ENVADD): Updated.
2011-01-23 11:38:14 +01:00
Glenn Morris
e9bffc61f2 Refill some copyright headers. 2011-01-15 18:21:30 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Christian Ohler
d221e7808c Add ERT, a tool for automated testing in Emacs Lisp.
* Makefile.in, configure.in, doc/misc/Makefile.in, doc/misc/makefile.w32-in:
Add ERT.  Make "make check" run tests in test/automated.

* doc/misc/ert.texi, lisp/emacs-lisp/ert.el, lisp/emacs-lisp/ert-x.el:
New files.

* test/automated: New directory.
2011-01-13 03:08:24 +11:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Glenn Morris
8289f37b64 doc/Makefile fixes related to inclusion of emacsver.texi.
* doc/lispref/Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.

* doc/misc/Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
(($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi.
($(infodir)/efaq): Remove -I option now in $MAKEINFO.
2010-10-28 00:21:43 -07:00
Glenn Morris
c12e4a81fe Add ps rules for some doc/ Makefiles.
* doc/misc/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.

* dos/lispref/Makefile.in (DVIPS): New variable.
(.PHONY): Add ps.
(ps, elisp.ps): New targets.
(clean): Delete ps file.

* doc/lispintro/Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
(.PHONY): Add ps.
(ps, emacs-lisp-intro.ps): New targets.
(clean): Delete ps file.

* doc/emacs/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
(DVIPS): New variable.
(.PHONY): Add ps.
(ps, emacs.ps, emacs-xtra.ps): New targets.
(clean): Delete ps files.
2010-10-10 17:30:34 -07:00
Glenn Morris
e836e5cd04 * doc/misc/Makefile.in: Missed a few spots in the earlier $< change. 2010-10-09 15:40:30 -07:00
Glenn Morris
c1dc72b395 Replace use of VPATH in most doc/ Makefiles.
* doc/lispref/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/elisp, infoclean): No need to cd $srcdir.

* doc/lispintro/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/eintr, infoclean): No need to cd $srcdir.

* doc/emacs/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/emacs, infoclean): No need to cd $srcdir.

* doc/misc/Makefile.in: Comment.
2010-10-09 14:19:09 -07:00
Glenn Morris
0f05450f83 * doc/misc/Makefile.in (mostlyclean): Delete *.toc. 2010-10-09 13:14:43 -07:00
Glenn Morris
d3a4ac46f5 * doc/misc/Makefile.in: Use $< in rules. 2010-10-09 13:12:18 -07:00
Glenn Morris
5bd2348590 Fix previous doc/*/Makefile.in change. 2010-10-09 12:27:22 -07:00
Glenn Morris
aa9db089bc Quieten emacs-devel.
* doc/misc/Makefile.in (maintainer-clean): Remove harmless, long-standing error.

* doc/lispref/Makefile.in (infoclean): Remove harmless, long-standing error.

* doc/lispintro/Makefile.in (infoclean): Remove harmless, long-standing error.

* doc/emacs/Makefile.in (infoclean): Remove harmless, long-standing error.
2010-10-09 11:39:01 -07:00
Glenn Morris
abd40fb4ee Avoid having a directory as a prerequisite in doc Makefiles.
It does not play well with time-stamping.

* doc/misc/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.  Use it in all the info rules, rather than depending
on infodir.

* doc/lispref/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/elisp): Use $mkinfodir instead of infodir.

* doc/lispintro/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/eintr): Use $mkinfodir instead of infodir.

* doc/emacs/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/emacs): Use $mkinfodir instead of infodir.
2010-10-09 11:31:12 -07:00
Glenn Morris
b13254e712 Add doc/ dependencies on emacsver.texi.
* doc/misc/Makefile.in ($(infodir)/efaq): Depend on emacsver.texi.

* doc/lispref/Makefile.in (srcs): Add emacsver.texi.

* doc/emacs/Makefile.in (EMACSSOURCES): Add emacsver.texi.
2010-10-08 19:09:46 -07:00
Glenn Morris
f7a31f1108 Set the version number in the texinfo manuals using configure.
* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.

* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.

* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.

* admin/admin.el (set-version): No need to act on doc/ files any more.

* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.
2010-10-08 18:41:21 -07:00
Glenn Morris
ea274122d5 Mark some doc/ rules as PHONY.
* doc/misc/Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.

* doc/lispref/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.

* doc/lispintro/Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.

* doc/emacs/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
(emacs): Remove rule.
(dist): No need to deal with the emacs rule any more.
2010-10-08 18:02:21 -07:00
Glenn Morris
8a944cea15 Minor doc/*/Makefile.in change.
* doc/emacs/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispintro/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispref/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/misc/Makefile.in ($(infodir)): Add parallel build workaround.
2010-10-05 21:20:46 -07:00
Glenn Morris
4c83f6e1e2 Misc cleanup for doc/*/Makefiles.
* doc/misc/Makefile.in (SHELL): Set it.
(info): Move the mkdir dependency to the individual info files.
(mostlyclean): Tidy up.
(clean): Only delete the specific dvi and pdf files.
(maintainer-clean): Be more restrictive in what we delete.

* doc/lispref/Makefile.in: Rearrange to more closely resemble
doc/emacs/Makefile.
(INSTALL_INFO): Remove unused variable.
(mostlyclean, infoclean, dist): New rules.
(clean): Delete dvi and pdf files.
(maintainer-clean): Remove elisp.oaux, use infoclean.

* doc/lispintro/Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
(INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
($(infodir), html, pdf, infoclean, dist): New rules.
(${infodir}/eintr): Ensure $infodir exists.  Use $@.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $^.
(.PHONY): Declare clean rules.
(mostlyclean): Delete more temp files.
(clean): Delete specific dvi, pdf and html files.
(maintainer-clean): Use infoclean.
(.NOEXPORT): Remove, unused by any other Makefile.in.

* doc/emacs/Makefile.in (EMACS_XTRA): Add the main source file.
(emacs-xtra.dvi, emacs-xtra.pdf): Remove explicit emacs-xtra.texi.
(mostlyclean): No core files, reorder other files.
(clean): Delete specific dvi and pdf files.
(infoclean, dist): New rules.
(maintainer-clean): Use infoclean.
2010-10-05 19:26:38 -07:00
Glenn Morris
5f87432784 Remove unused variable top_srcdir from doc Makefiles.
* doc/emacs/Makefile.in (top_srcdir): Remove unused variable.
* doc/misc/Makefile.in (top_srcdir): Remove unused variable.
2010-09-28 21:25:59 -07:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
698bfef706 (INFO_TARGETS, DVI_TARGETS): Add edt.
(edt, $(infodir)/edt, edt.dvi): New targets.

(PDF_TARGETS, pdf): New.
(clean): Add *.pdf.
Add pdf rules for all manuals.
2009-12-15 03:01:20 +00:00
Chong Yidong
3149927d2f * Makefile.in: Build the Semantic manual.
* semantic.texi, sem-user.texi: New files, adapted from the Semantic
repository.
2009-11-16 22:25:49 +00:00
Chong Yidong
966a6506b3 * eieio.texi:
* ede.texi: New files.

* Makefile.in: Build EIEIO and EDE manuals.
2009-10-07 01:10:52 +00:00