From: Dan Nicolaescu Date: Fri, 23 Apr 2010 17:40:47 +0000 (-0700) Subject: * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~412 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a63f80b465fa89d4a3905dbbe82d5ecc01991b29;p=emacs.git * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused. (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS. --- diff --git a/src/ChangeLog b/src/ChangeLog index 161bdb80e15..73e0d967678 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/Makefile.in b/src/Makefile.in index e0b7013c0ab..e6f64651b72 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -196,12 +196,6 @@ DEPFLAGS = -MMD -MF deps/$*.d #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 @@ LD=ld /* 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