Mercurial > emacs
diff src/Makefile.in @ 108787:b06e3f33ea78
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 25 May 2010 20:42:07 -0700 |
| parents | 42633fb118e9 |
| children | 939ecb6ccd4d |
line wrap: on
line diff
--- a/src/Makefile.in Tue May 25 20:36:05 2010 -0700 +++ b/src/Makefile.in Tue May 25 20:42:07 2010 -0700 @@ -111,14 +111,8 @@ ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ -## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. -@NS_IMPL_GNUSTEP_INC@ - -## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC. -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@ - ## Flags to pass to ld only for temacs. -TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) +TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
