diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:30:13 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:30:13 -0700 |
| commit | be4ff9dad8bf43251f78f58a9ce86cf8bb153300 (patch) | |
| tree | b61fdf0af5566b9a1fde833b4beb05df4e4be863 /msdos | |
| parent | 5b5262f4da935f37376c548e31e234bf2073ebef (diff) | |
| download | emacs-be4ff9dad8bf43251f78f58a9ce86cf8bb153300.tar.gz | |
Define some malloc objects with configure, not cpp.
* configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables.
* config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc.
* src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
(gmallocobj, vmlimitobj): Replace with previous two variables.
(otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
* msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
(VMLIMIT_OBJ): Edit to vm-limit.o.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 6763fcd6878..4ce549cfd8b 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2010-05-18 Glenn Morris <rgm@gnu.org> + + * sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o. + (VMLIMIT_OBJ): Edit to vm-limit.o. + 2010-05-17 Glenn Morris <rgm@gnu.org> * sed1v2.inp (OLDXMENU_DEPS): Edit to empty. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index ac088cdcf86..906d558ed75 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -116,6 +116,8 @@ s/\.h\.in/.h-in/ /^OLDXMENU *=/s/@OLDXMENU@// /^LIBXMENU *=/s/@LIBXMENU@// /^LIBX_OTHER *=/s/@LIBX_OTHER@// +/^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/ +/^VMLIMIT_OBJ *=/s/@VMLIMIT_OBJ@/vm-limit.o/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ |