diff --git a/src/ChangeLog b/src/ChangeLog index 91c413947ecbc06a546a32806310730a875a4632..df37eed392b95f2a7e6d6588b5932f7f3a03fe90 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-11-26 Richard M. Stallman + + * Makefile.in (mallocobj): Simplify logic using auxiliary vars. + 2001-11-25 Stefan Monnier * textprop.c (set_text_properties_1): Clearly mark that the diff --git a/src/Makefile.in b/src/Makefile.in index b20ec7d0add65e749a5ddd11b462fe3c1d4371c1..d417c18cfa01bd325c52f94c67673819947e84f5 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 */