# HG changeset patch # User Dan Nicolaescu # Date 1272044447 25200 # Node ID e89f03024591ae94f5cd9d7f9e3e7ed73210cabd # Parent 34eca4ecfbe678721a6ee584228f9073a023c364 * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused. (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS. diff -r 34eca4ecfbe6 -r e89f03024591 src/ChangeLog --- 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 + + * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused. + (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS. + 2010-04-23 Stefan Monnier * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style. diff -r 34eca4ecfbe6 -r e89f03024591 src/Makefile.in --- 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