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 /msdos | |
| 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 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 8c94734a44f..db8a37896b8 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-26 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): | ||
| 4 | No longer present. | ||
| 5 | |||
| 1 | 2010-05-25 Glenn Morris <rgm@gnu.org> | 6 | 2010-05-25 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present. | 8 | * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present. |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 5317e8246f3..eec6be62195 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -129,8 +129,6 @@ s/\.h\.in/.h-in/ | |||
| 129 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! | 129 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! |
| 130 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! | 130 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! |
| 131 | /^@SET_MAKE@$/s/@SET_MAKE@// | 131 | /^@SET_MAKE@$/s/@SET_MAKE@// |
| 132 | /^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// | ||
| 133 | /^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// | ||
| 134 | /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! | 132 | /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! |
| 135 | /^.\${libsrc}make-doc/s!>.*$!! | 133 | /^.\${libsrc}make-doc/s!>.*$!! |
| 136 | /^[ ]*$/d | 134 | /^[ ]*$/d |