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.

2 files changed, 17 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f6a45a4118..e5c6a0b23b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index cc7b1477d35..e221c4a5934 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -411,7 +411,9 @@ termcapobj = terminfo.o
 termcapobj = tparam.o
 #endif /* ! defined (TERMINFO) */
 
-
+gmallocobj =
+rallocobj =
+vmlimitobj =
 #ifndef SYSTEM_MALLOC
 #ifndef DOUG_LEA_MALLOC
 gmallocobj = gmalloc.o
@@ -424,10 +426,14 @@ rallocobj = ralloc.o
 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 \