[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/Makefile.in
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/Makefile.in |
Date: |
Mon, 26 Nov 2001 05:51:26 -0500 |
Index: emacs/src/Makefile.in
diff -u emacs/src/Makefile.in:1.235 emacs/src/Makefile.in:1.236
--- emacs/src/Makefile.in:1.235 Mon Oct 8 01:11:15 2001
+++ emacs/src/Makefile.in Mon Nov 26 05:51:26 2001
@@ -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 */
- [Emacs-diffs] Changes to emacs/src/Makefile.in,
Richard M. Stallman <=