Mercurial > emacs
changeset 108086:e89f03024591
* Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
(TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 23 Apr 2010 10:40:47 -0700 |
| parents | 34eca4ecfbe6 |
| children | 076e73b014a5 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 23 12:26:11 2010 -0400 +++ b/src/ChangeLog Fri Apr 23 10:40:47 2010 -0700 @@ -1,3 +1,8 @@ +2010-04-23 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused. + (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS. + 2010-04-23 Stefan Monnier <monnier@iro.umontreal.ca> * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
--- a/src/Makefile.in Fri Apr 23 12:26:11 2010 -0400 +++ b/src/Makefile.in Fri Apr 23 10:40:47 2010 -0700 @@ -196,12 +196,6 @@ #define LD_SWITCH_MACHINE #endif -/* This holds special options for linking temacs - that should be used for linking anything else. */ -#ifndef LD_SWITCH_MACHINE_TEMACS -#define LD_SWITCH_MACHINE_TEMACS -#endif - /* These macros are for switches specifically related to X Windows. */ #ifndef C_SWITCH_X_MACHINE #define C_SWITCH_X_MACHINE @@ -403,7 +397,7 @@ /* Flags to pass to LD only for temacs. */ /* Do not split this line with a backslash. That can cause trouble with some cpps. */ -TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS +TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE /* A macro which other sections of Makefile can redefine to munge the flags before they are passed to LD. This is helpful if you have