[Emacs-diffs] /srv/bzr/emacs/trunk r100011: * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100011
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-23 10:40:47 -0700
message:
  * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
  (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-23 15:50:48 +0000
+++ b/src/ChangeLog     2010-04-23 17:40:47 +0000
@@ -1,3 +1,8 @@
+2010-04-23  Dan Nicolaescu  <address@hidden>
+
+       * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
+       (TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
+
 2010-04-23  Stefan Monnier  <address@hidden>
 
        * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-23 07:21:18 +0000
+++ b/src/Makefile.in   2010-04-23 17:40:47 +0000
@@ -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