From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 26 Nov 2001 10:52:40 +0000 (+0000)
Subject: (mallocobj): Simplify logic using auxiliary vars.
X-Git-Tag: ttn-vms-21-2-B4~18148
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2fa0eedfbc3bec95db9a8f896a4dc4931e461137;p=emacs.git

(mallocobj): Simplify logic using auxiliary vars.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 91c413947ec..df37eed392b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-26  Richard M. Stallman  <rms@gnu.org>
+
+	* Makefile.in (mallocobj): Simplify logic using auxiliary vars.
+
 2001-11-25  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* textprop.c (set_text_properties_1): Clearly mark that the
diff --git a/src/Makefile.in b/src/Makefile.in
index b20ec7d0add..d417c18cfa0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -570,19 +570,15 @@ termcapobj = tparam.o
 
 #ifndef SYSTEM_MALLOC
 
-#ifdef DOUG_LEA_MALLOC
-#ifdef REL_ALLOC
-mallocobj = ralloc.o vm-limit.o
-#else /* ! defined (REL_ALLOC) */
-mallocobj = vm-limit.o
-#endif /* ! defined (REL_ALLOC) */
-#else /* ! defined (DOUG_LEA_MALLOC) */
+#ifndef DOUG_LEA_MALLOC
+gmallocobj = gmalloc.o
+#endif
+
 #ifdef REL_ALLOC
-mallocobj = gmalloc.o ralloc.o vm-limit.o
-#else /* ! defined (REL_ALLOC) */
-mallocobj = gmalloc.o vm-limit.o
-#endif /* ! defined (REL_ALLOC) */
-#endif /* ! defined (DOUG_LEA_MALLOC) */
+rallocobj = ralloc.o
+#endif
+
+mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
 
 #endif /* SYSTEM_MALLOC */