2 files changed, 16 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eedd0474dc2..bb5d7e6d427 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
+        (gmallocobj, vmlimitobj): Replace with previous two variables.
+        (otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
+
 2010-05-17  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (OLDXMENU_DEPS): New, set by configure.
diff --git a/src/Makefile.in b/src/Makefile.in
index 571fbf5b1b1..ff3726df6f8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -401,28 +401,25 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ)
 
-gmallocobj =
-rallocobj =
-vmlimitobj =
-#ifndef SYSTEM_MALLOC
-#ifndef DOUG_LEA_MALLOC
-gmallocobj = gmalloc.o
-#endif
+/* gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty.  */
+GMALLOC_OBJ=@GMALLOC_OBJ@
+
+/* vm-limit.o if !SYSTEM_MALLOC, else empty.  */
+VMLIMIT_OBJ=@VMLIMIT_OBJ@
 
-#ifdef REL_ALLOC
+#if defined (REL_ALLOC) && ! defined (SYSTEM_MALLOC)
 rallocobj = ralloc.o
+#else
+rallocobj =
 #endif
 
-vmlimitobj = vm-limit.o
-#endif /* !SYSTEM_MALLOC */
-
 /* Empty on Cygwin, lastfile.o elsewhere.  */
 PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
-/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.  */
+/* lastfile.o vm-limit.o on Cygwin, $VMLIMIT_OBJ elsewhere.  */
 POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* List of object files that make-docfile should not be told about.  */
-otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
+otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(rallocobj) \
   $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 /* This is the platform-specific list of Lisp files loaded into the