diff options
| author | Glenn Morris | 2010-05-25 20:42:07 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-25 20:42:07 -0700 |
| commit | ccd89fb3d6475cae1df64a64f87977c21e98389b (patch) | |
| tree | 13c59eaf566fdb239414f3398bbb20aa78db1730 /src/Makefile.in | |
| parent | 4710f4fcc51f8465e9b6f4099e66dcea04f59997 (diff) | |
| download | emacs-ccd89fb3d6475cae1df64a64f87977c21e98389b.tar.gz emacs-ccd89fb3d6475cae1df64a64f87977c21e98389b.zip | |
Remove some NS_IMPL_GNUSTEP build dead code.
* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
(GNUSTEP_MAKEFILES): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
stuff to here.
* src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Remove.
(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
* msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
No longer present.
Comments:
See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
Nothing from gui.make was used at all in src/Makefile.in. The only
thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
set shared _after_ sourcing base.make, it was always empty. We can
move the remaining flags, set in configure, to the standard variable
LD_SWITCH_SYSTEM_TEMACS.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 0a2d1d0a8ab..bbe573e69be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -111,14 +111,8 @@ LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ | |||
| 111 | ## which are only good with temacs. | 111 | ## which are only good with temacs. |
| 112 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ | 112 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ |
| 113 | 113 | ||
| 114 | ## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. | ||
| 115 | @NS_IMPL_GNUSTEP_INC@ | ||
| 116 | |||
| 117 | ## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC. | ||
| 118 | NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@ | ||
| 119 | |||
| 120 | ## Flags to pass to ld only for temacs. | 114 | ## Flags to pass to ld only for temacs. |
| 121 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) | 115 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) |
| 122 | 116 | ||
| 123 | ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). | 117 | ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). |
| 124 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ | 118 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |