diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:44:07 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:44:07 -0700 |
| commit | 40dc6bf44ec6e258dabd6aa3c674f8e65ded64bb (patch) | |
| tree | 2fd6c610f4a8a842abc4816dbdd87ff35949e959 /src/Makefile.in | |
| parent | be4ff9dad8bf43251f78f58a9ce86cf8bb153300 (diff) | |
| download | emacs-40dc6bf44ec6e258dabd6aa3c674f8e65ded64bb.tar.gz | |
Set rallocobj with configure, not cpp.
* configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC.
(RALLOC_OBJ): New output variable.
* config.bat (RALLOC_OBJ): Edit to empty if sys_malloc.
* src/Makefile.in (RALLOC_OBJ): New, set by configure.
(rallocobj): Replace with the previous variable.
(otherobj): Use $RALLOC_OBJ.
* src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
* src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.
* msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ff3726df6f8..6ed6e97b420 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -407,11 +407,8 @@ GMALLOC_OBJ=@GMALLOC_OBJ@ /* vm-limit.o if !SYSTEM_MALLOC, else empty. */ VMLIMIT_OBJ=@VMLIMIT_OBJ@ -#if defined (REL_ALLOC) && ! defined (SYSTEM_MALLOC) -rallocobj = ralloc.o -#else -rallocobj = -#endif +/* ralloc.o if !SYSTEM_MALLOC && REL_ALLOC, else empty. */ +RALLOC_OBJ=@RALLOC_OBJ@ /* Empty on Cygwin, lastfile.o elsewhere. */ PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ @@ -419,7 +416,7 @@ PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ /* List of object files that make-docfile should not be told about. */ -otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(rallocobj) \ +otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) /* This is the platform-specific list of Lisp files loaded into the |