From d7c664f351958c5a74892cd651713ea4f6a7ae77 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 4 Jul 2008 03:39:37 +0000 Subject: [PATCH] (${etc}DOC): Depend on ${lisp} rather than ${shortlisp}. --- src/ChangeLog | 30 +++++++++++++++++------------- src/Makefile.in | 7 ++++++- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b053a990491..81f6520eb89 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-07-04 Stefan Monnier + + * Makefile.in (${etc}DOC): Depend on ${lisp} rather than ${shortlisp}. + 2008-07-04 Kenichi Handa * fns.c (Fstring_to_unibyte): Delete the arg ACCEPT-LATIN-1. @@ -6,28 +10,28 @@ 2008-07-02 Jason Rumney - * xfns.c (syms_of_xfns): Only define x-select-font when both - HAVE_FREETYPE and USE_GTK + * 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. + * xdisp.c (next_element_from_display_vector): Move assignment out + of if statement. 2008-07-02 Toru Tsuneyoshi - * lisp.h (Qdelete_file, Qdelete_directory): Declare extern. + * 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. + * 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. + * 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 - * 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 diff --git a/src/Makefile.in b/src/Makefile.in index f359d619764..f3afe86e1ec 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -920,7 +920,12 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP} 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} -- 2.39.2