# HG changeset patch # User Richard M. Stallman # Date 1006771886 0 # Node ID f30168d4d5e61006a8b5e4e4ff38365d39de99f6 # Parent 9736d12fa64c04839b18c7f4d7136c2cb74ad595 (mallocobj): Simplify logic using auxiliary vars. diff -r 9736d12fa64c -r f30168d4d5e6 src/Makefile.in --- 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 */