Mercurial > emacs
changeset 108185:804e9ced8374
Rework previous autoconf changes, hopefully to make clearer.
* configure.in (OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
* configure: Regenerate.
* src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
for clarity.
(OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
(otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 30 Apr 2010 20:04:51 -0700 |
| parents | f4b0e5358091 |
| children | 3287df4f3442 |
| files | ChangeLog configure configure.in src/ChangeLog src/Makefile.in |
| diffstat | 5 files changed, 36 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 30 19:58:41 2010 -0700 +++ b/ChangeLog Fri Apr 30 20:04:51 2010 -0700 @@ -1,3 +1,8 @@ +2010-05-01 Glenn Morris <rgm@gnu.org> + + * configure.in (OTHER_OBJ): Remove. + (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables. + 2010-04-30 Glenn Morris <rgm@gnu.org> * configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
--- a/configure Fri Apr 30 19:58:41 2010 -0700 +++ b/configure Fri Apr 30 20:04:51 2010 -0700 @@ -802,7 +802,8 @@ OLDXMENU LIBXMENU CYGWIN_OBJ -OTHER_OBJ +PRE_ALLOC_OBJ +POST_ALLOC_OBJ LTLIBOBJS' ac_subst_files='' ac_user_opts=' @@ -26166,15 +26167,17 @@ fi -OTHER_OBJ="\$(gmallocobj) \$(rallocobj)" if test "$opsys" = "cygwin"; then CYGWIN_OBJ="sheap.o" ## Cygwin differs because of its unexec(). - OTHER_OBJ="$OTHER_OBJ lastfile.o vm-limit.o" + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ="lastfile.o vm-limit.o" else CYGWIN_OBJ= - OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)" -fi + PRE_ALLOC_OBJ=lastfile.o + POST_ALLOC_OBJ="\$(vmlimitobj)" +fi +
--- a/configure.in Fri Apr 30 19:58:41 2010 -0700 +++ b/configure.in Fri Apr 30 20:04:51 2010 -0700 @@ -2952,17 +2952,19 @@ fi -OTHER_OBJ="\$(gmallocobj) \$(rallocobj)" if test "$opsys" = "cygwin"; then CYGWIN_OBJ="sheap.o" ## Cygwin differs because of its unexec(). - OTHER_OBJ="$OTHER_OBJ lastfile.o vm-limit.o" + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ="lastfile.o vm-limit.o" else CYGWIN_OBJ= - OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)" + PRE_ALLOC_OBJ=lastfile.o + POST_ALLOC_OBJ="\$(vmlimitobj)" fi AC_SUBST(CYGWIN_OBJ) -AC_SUBST(OTHER_OBJ) +AC_SUBST(PRE_ALLOC_OBJ) +AC_SUBST(POST_ALLOC_OBJ) AH_TOP([/* GNU Emacs site configuration template file. Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
--- a/src/ChangeLog Fri Apr 30 19:58:41 2010 -0700 +++ b/src/ChangeLog Fri Apr 30 20:04:51 2010 -0700 @@ -1,3 +1,11 @@ +2010-05-01 Glenn Morris <rgm@gnu.org> + + * Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null, + for clarity. + (OTHER_OBJ): Remove. + (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure. + (otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ. + 2010-05-01 Karel Klíč <kklic@redhat.com> * fileio.c (Ffile_selinux_context): Context functions may return null.
--- a/src/Makefile.in Fri Apr 30 19:58:41 2010 -0700 +++ b/src/Makefile.in Fri Apr 30 20:04:51 2010 -0700 @@ -411,7 +411,9 @@ termcapobj = tparam.o #endif /* ! defined (TERMINFO) */ - +gmallocobj = +rallocobj = +vmlimitobj = #ifndef SYSTEM_MALLOC #ifndef DOUG_LEA_MALLOC gmallocobj = gmalloc.o @@ -424,10 +426,14 @@ vmlimitobj = vm-limit.o #endif /* !SYSTEM_MALLOC */ -OTHER_OBJ=@OTHER_OBJ@ +## Empty on Cygwin, lastfile.o elsewhere. +PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ +## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere. +POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ /* List of object files that make-docfile should not be told about. */ -otherobj= $(termcapobj) $(OTHER_OBJ) $(WIDGET_OBJ) $(LIBOBJS) +otherobj= $(termcapobj) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ + $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) #ifdef HAVE_MOUSE #define MOUSE_SUPPORT ${lispsource}mouse.elc \