diff options
| author | Glenn Morris | 2007-09-12 07:16:39 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-09-12 07:16:39 +0000 |
| commit | 67d20687160767f448fb3415827729c6280be45c (patch) | |
| tree | 9c6d60a6a66126c1ac61a52d3af602871d981758 /src | |
| parent | d31440c56562a902887c0c38ba8b357f5cb0d7e5 (diff) | |
| download | emacs-67d20687160767f448fb3415827729c6280be45c.tar.gz emacs-67d20687160767f448fb3415827729c6280be45c.zip | |
(alloca): Do not undef.
(allocaobj, alloca.o): Remove.
(otherobj): Remove allocaobj.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ef0136cd045..6e91db7262d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -75,12 +75,6 @@ SHELL=/bin/sh | |||
| 75 | #define NOT_C_CODE | 75 | #define NOT_C_CODE |
| 76 | #include "config.h" | 76 | #include "config.h" |
| 77 | 77 | ||
| 78 | /* We will not really call alloca; | ||
| 79 | do not let the file name alloca.c get messed up. */ | ||
| 80 | #ifdef alloca | ||
| 81 | #undef alloca | ||
| 82 | #endif | ||
| 83 | |||
| 84 | /* Do not let the file name mktime.c get messed up. */ | 78 | /* Do not let the file name mktime.c get messed up. */ |
| 85 | #ifdef mktime | 79 | #ifdef mktime |
| 86 | #undef mktime | 80 | #undef mktime |
| @@ -650,12 +644,6 @@ mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o | |||
| 650 | #endif /* SYSTEM_MALLOC */ | 644 | #endif /* SYSTEM_MALLOC */ |
| 651 | 645 | ||
| 652 | 646 | ||
| 653 | #ifndef HAVE_ALLOCA | ||
| 654 | allocaobj = alloca.o | ||
| 655 | #else | ||
| 656 | allocaobj = | ||
| 657 | #endif | ||
| 658 | |||
| 659 | #ifdef USE_X_TOOLKIT | 647 | #ifdef USE_X_TOOLKIT |
| 660 | widgetobj= widget.o | 648 | widgetobj= widget.o |
| 661 | #else /* not USE_X_TOOLKIT */ | 649 | #else /* not USE_X_TOOLKIT */ |
| @@ -667,9 +655,9 @@ widgetobj= | |||
| 667 | should not be told about. */ | 655 | should not be told about. */ |
| 668 | #ifdef CYGWIN | 656 | #ifdef CYGWIN |
| 669 | /* Cygwin differs because of its unexec(). */ | 657 | /* Cygwin differs because of its unexec(). */ |
| 670 | otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(allocaobj) $(widgetobj) $(LIBOBJS) | 658 | otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(widgetobj) $(LIBOBJS) |
| 671 | #else | 659 | #else |
| 672 | otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS) | 660 | otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) |
| 673 | #endif | 661 | #endif |
| 674 | 662 | ||
| 675 | #ifdef HAVE_MOUSE | 663 | #ifdef HAVE_MOUSE |
| @@ -1098,12 +1086,6 @@ stamp-oldxmenu: | |||
| 1098 | @echo "Please run the `configure' script again." | 1086 | @echo "Please run the `configure' script again." |
| 1099 | exit 1 | 1087 | exit 1 |
| 1100 | 1088 | ||
| 1101 | /* Some machines have alloca built-in. | ||
| 1102 | They should define HAVE_ALLOCA. | ||
| 1103 | Some use the C version in alloca.c (these define C_ALLOCA in config.h). | ||
| 1104 | */ | ||
| 1105 | alloca.o: alloca.c blockinput.h atimer.h systime.h | ||
| 1106 | |||
| 1107 | /* Nearly all the following files depend on lisp.h, | 1089 | /* Nearly all the following files depend on lisp.h, |
| 1108 | but it is not included as a dependency because | 1090 | but it is not included as a dependency because |
| 1109 | it is so often changed in ways that do not require any recompilation | 1091 | it is so often changed in ways that do not require any recompilation |