Mercurial > emacs
changeset 96505:bbe6c9643969
(${etc}DOC): Depend on ${lisp} rather than ${shortlisp}.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 04 Jul 2008 03:39:37 +0000 |
| parents | 429b0f809e06 |
| children | 675709b2568f |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 26 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jul 04 02:26:05 2008 +0000 +++ b/src/ChangeLog Fri Jul 04 03:39:37 2008 +0000 @@ -1,3 +1,7 @@ +2008-07-04 Stefan Monnier <monnier@iro.umontreal.ca> + + * Makefile.in (${etc}DOC): Depend on ${lisp} rather than ${shortlisp}. + 2008-07-04 Kenichi Handa <handa@m17n.org> * fns.c (Fstring_to_unibyte): Delete the arg ACCEPT-LATIN-1. @@ -6,28 +10,28 @@ 2008-07-02 Jason Rumney <jasonr@gnu.org> - * xfns.c (syms_of_xfns): Only define x-select-font when both - HAVE_FREETYPE and USE_GTK - - * xdisp.c (next_element_from_display_vector): Move assignment out - of if statement. + * xfns.c (syms_of_xfns): Only define x-select-font when both + HAVE_FREETYPE and USE_GTK + + * xdisp.c (next_element_from_display_vector): Move assignment out + of if statement. 2008-07-02 Toru Tsuneyoshi <t_tuneyosi@hotmail.com> - * lisp.h (Qdelete_file, Qdelete_directory): Declare extern. - - * fileio.c (delete_by_moving_to_trash, Qmove_file_to_trash): New vars. - (syms_of_fileio): Initialize and export them. - (Fdelete_directory, Fdelete_file): Optionally delete via trash. - - * w32fns.c (FOF_NO_CONNECTED_ELEMENTS): Define if not already. - (Fsystem_move_file_to_trash): New function. - (syms_of_w32fns): Export it to lisp. + * lisp.h (Qdelete_file, Qdelete_directory): Declare extern. + + * fileio.c (delete_by_moving_to_trash, Qmove_file_to_trash): New vars. + (syms_of_fileio): Initialize and export them. + (Fdelete_directory, Fdelete_file): Optionally delete via trash. + + * w32fns.c (FOF_NO_CONNECTED_ELEMENTS): Define if not already. + (Fsystem_move_file_to_trash): New function. + (syms_of_w32fns): Export it to lisp. 2008-07-01 Jason Rumney <jasonr@gnu.org> - * w32font.c (w32font_text_extents): Don't count overhang as part - of width. + * w32font.c (w32font_text_extents): Don't count overhang as part + of width. 2008-06-30 Miles Bader <miles@gnu.org>
--- a/src/Makefile.in Fri Jul 04 02:26:05 2008 +0000 +++ b/src/Makefile.in Fri Jul 04 03:39:37 2008 +0000 @@ -920,7 +920,12 @@ for the first time, this prevents any variation between configurations in the contents of the DOC file. Likewise for ${SOME_MACHINE_LISP}. */ -${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LISP} +/* Most of this Makefile refers to Lisp files via ${lispsource}, so + we also use ${lisp} rather than ${shortlisp} for the dependency since + the Makefile uses string equality to decide when we talk about identical + files. Apparently we pass ${shortlisp} rather than ${lisp} to make-docfile + only in order to reduce the command line length. --Stef */ +${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP} -rm -f ${etc}DOC ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}