diff options
| author | Glenn Morris | 2010-05-24 20:46:15 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-24 20:46:15 -0700 |
| commit | e545800352a38dc328cc5251bb44d1e93d0d2012 (patch) | |
| tree | 83671eeb666c2d078fe321e306090965a2fd1bfe /src | |
| parent | 6169260ba91654ead4d00333bd9a9034bf925dad (diff) | |
| download | emacs-e545800352a38dc328cc5251bb44d1e93d0d2012.tar.gz emacs-e545800352a38dc328cc5251bb44d1e93d0d2012.zip | |
Remove LD_SWITCH_SYSTEM_EXTRA.
* configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
here instead.
* src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
* msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 959c3fbcb54..79d8946e954 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove. | ||
| 4 | (TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA. | ||
| 5 | |||
| 1 | 2010-05-25 Kenichi Handa <handa@m17n.org> | 6 | 2010-05-25 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * dispextern.h (struct composition_it): New members rule_idx and | 8 | * dispextern.h (struct composition_it): New members rule_idx and |
diff --git a/src/Makefile.in b/src/Makefile.in index 554caa44a97..0bb36ecb838 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -110,10 +110,9 @@ LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ | |||
| 110 | 110 | ||
| 111 | ## System-specific LDFLAGS. | 111 | ## System-specific LDFLAGS. |
| 112 | LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ | 112 | LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ |
| 113 | LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@ | ||
| 114 | 113 | ||
| 115 | ## Flags to pass to ld only for temacs. | 114 | ## Flags to pass to ld only for temacs. |
| 116 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS) | 115 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) |
| 117 | 116 | ||
| 118 | ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). | 117 | ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). |
| 119 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ | 118 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |