Mercurial > emacs

changeset 41542:f30168d4d5e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(mallocobj): Simplify logic using auxiliary vars.
author Richard M. Stallman <rms@gnu.org>
date Mon, 26 Nov 2001 10:51:26 +0000
parents 9736d12fa64c
children 4898057655bc
files src/Makefile.in
diffstat 1 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Mon Nov 26 10:09:56 2001 +0000
+++ b/src/Makefile.in	Mon Nov 26 10:51:26 2001 +0000
@@ -570,19 +570,15 @@
 
 #ifndef SYSTEM_MALLOC
 
-#ifdef DOUG_LEA_MALLOC
+#ifndef DOUG_LEA_MALLOC
+gmallocobj = gmalloc.o
+#endif
+
 #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) */
-#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 */