2 files changed, 7 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d451e873adb..ba513b1bcf2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-26  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+        Remove.
+        (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+
 2010-05-26  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (composition_compute_stop_pos): Fix condition for
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@
 ## 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@