[Emacs-diffs] /srv/bzr/emacs/trunk r100161: Remove some unused Makefile.in variables.

[Glenn Morris]

------------------------------------------------------------
revno: 100161
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-06 00:24:18 -0700
message:
  Remove some unused Makefile.in variables.
  
  * configure.in (AC_PROG_LN_S): Remove test, nothing uses @address@hidden
  
  * Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
  (LD_SWITCH_X_SITE): Remove unused variables.
  
  * lwlib/Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
  
  * oldXMenu/Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, 
MAKE)
  (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
  
  * src/Makefile.in (CPP, LN_S): Remove unused variables.
  
  * msdos/sed1v2.inp, msdos/sed5x.inp: Remove LN_S, unused.
modified:
  ChangeLog
  Makefile.in
  configure.in
  lwlib/ChangeLog
  lwlib/Makefile.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed5x.inp
  oldXMenu/ChangeLog
  oldXMenu/Makefile.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-04 03:26:38 +0000
+++ b/ChangeLog 2010-05-06 07:24:18 +0000
@@ -1,3 +1,10 @@
+2010-05-06  Glenn Morris  <address@hidden>
+
+       * configure.in (AC_PROG_LN_S): Remove test, nothing uses @address@hidden
+
+       * Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
+       (LD_SWITCH_X_SITE): Remove unused variables.
+
 2010-05-04  Glenn Morris  <address@hidden>
 
        * configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE

=== modified file 'Makefile.in'
--- a/Makefile.in       2010-05-04 03:26:38 +0000
+++ b/Makefile.in       2010-05-06 07:24:18 +0000
@@ -69,15 +69,9 @@
 # ==================== Things `configure' Might Edit ====================
 
 address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 

=== modified file 'configure.in'
--- a/configure.in      2010-05-04 03:13:35 +0000
+++ b/configure.in      2010-05-06 07:24:18 +0000
@@ -755,7 +755,6 @@
 #### Some other nice autoconf tests.
 
 dnl checks for programs
-AC_PROG_LN_S
 AC_PROG_CPP
 AC_PROG_INSTALL
 if test "x$RANLIB" = x; then

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2010-05-04 03:20:50 +0000
+++ b/lwlib/ChangeLog   2010-05-06 07:24:18 +0000
@@ -1,3 +1,7 @@
+2010-05-06  Glenn Morris  <address@hidden>
+
+       * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
+
 2010-05-04  Glenn Morris  <address@hidden>
 
        * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE):

=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2010-05-04 03:20:50 +0000
+++ b/lwlib/Makefile.in 2010-05-06 07:24:18 +0000
@@ -32,27 +32,21 @@
 
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 # See address@hidden@ is used below.
 address@hidden@
 
-              TOP = .
-
-               AR = ar cq
-
-               LN = ln -s
-               RM = rm -f
-
-     LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
-     MOTIF_OBJS = lwlib-Xm.o
+AR = ar cq
+RM = rm -f
+
+LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
+MOTIF_OBJS = lwlib-Xm.o
 
 TOOLKIT_DEFINES = 
-   TOOLKIT_OBJS = $(@address@hidden)
+TOOLKIT_OBJS = $(@address@hidden)
 
-           OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
+OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
 
 # ../src is needed to find config.h.
 ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-04-03 01:54:24 +0000
+++ b/msdos/ChangeLog   2010-05-06 07:24:18 +0000
@@ -1,3 +1,7 @@
+2010-05-06  Glenn Morris  <address@hidden>
+
+       * sed1v2.inp, sed5x.inp: Remove LN_S, unused.
+
 2010-04-01  Eli Zaretskii  <address@hidden>
 
        Remove support for DJGPP v1.x.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-03-27 10:49:18 +0000
+++ b/msdos/sed1v2.inp  2010-05-06 07:24:18 +0000
@@ -2,8 +2,8 @@
 # Configuration script for src/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -50,7 +50,6 @@
 /^OTHER_FILES *=/s/@OTHER_FILES@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
 /^version *=/s/@address@hidden@//
-/^LN_S *=/s/@address@hidden@/ln -s/
 /^M_FILE *=/address@hidden@address@hidden/intel386.h!
 /^S_FILE *=/address@hidden@address@hidden/msdos.h!
 /address@hidden@$/s/@SET_MAKE@//

=== modified file 'msdos/sed5x.inp'
--- a/msdos/sed5x.inp   2010-01-13 08:35:10 +0000
+++ b/msdos/sed5x.inp   2010-05-06 07:24:18 +0000
@@ -2,8 +2,8 @@
 # Configuration script for oldxmenu/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+#   2009, 2010  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -22,7 +22,6 @@
 /^CC *=/s/@address@hidden@/gcc/
 /^CPP *=/s/@address@hidden@/gcc -e/
 /^CFLAGS *=/s/@address@hidden@/-O2 -g/
-/^LN_S *=/s/@address@hidden@/ln -s/
 s/|| true//
 
 # arch-tag: 612a79be-2a02-4cb0-8dec-779aac0a2f4f

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2010-05-04 03:26:38 +0000
+++ b/oldXMenu/ChangeLog        2010-05-06 07:24:18 +0000
@@ -1,3 +1,8 @@
+2010-05-06  Glenn Morris  <address@hidden>
+
+       * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
+       (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
+
 2010-05-04  Glenn Morris  <address@hidden>
 
        * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use

=== modified file 'oldXMenu/Makefile.in'
--- a/oldXMenu/Makefile.in      2010-05-04 03:26:38 +0000
+++ b/oldXMenu/Makefile.in      2010-05-06 07:24:18 +0000
@@ -15,8 +15,8 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-##   Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+##   2010  Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 
 ## To the best of our knowledge, this code was originally based on the
 ## X11 oldXMenu Makefile, which was automatically generated from the
-## X11 oldXMenu Imakefile. There was no explicit copyright information
+## X11 oldXMenu Imakefile.  There was no explicit copyright information
 ## in the Imakefile, therefore we have added the same MIT license as
 ## used by the rest of the oldXMenu code.
 
@@ -53,24 +53,11 @@
 EXTRA=insque.o
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
-             AS = as
-             LD = ld
-           TAGS = etags
-             RM = rm -f
-             MV = mv
-         RANLIB = ranlib
+TAGS = etags
+RM = rm -f
+RANLIB = ranlib
 # Solaris 2.1 ar doesn't accept the 'l' option.
-             AR = ar cq
-             LS = ls
-       LINTOPTS = -axz
-    LINTLIBFLAG = -C
-           MAKE = make
-    STD_DEFINES =
-    CDEBUGFLAGS = -O
-         RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
-                       tags TAGS make.log
+AR = ar cq
 
 OBJS =  Activate.o \
        AddPane.o \

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-05 17:51:40 +0000
+++ b/src/ChangeLog     2010-05-06 07:24:18 +0000
@@ -1,3 +1,7 @@
+2010-05-06  Glenn Morris  <address@hidden>
+
+       * Makefile.in (CPP, LN_S): Remove unused variables.
+
 2010-05-05  Stefan Monnier  <address@hidden>
 
        * syntax.c (Fchar_syntax): Check the arg is a character (bug#6080).

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-06 05:50:26 +0000
+++ b/src/Makefile.in   2010-05-06 07:24:18 +0000
@@ -37,11 +37,9 @@
 abs_builddir = @abs_builddir@
 VPATH = $(srcdir)
 CC = @CC@
-CPP = @CPP@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LN_S = @LN_S@
 EXEEXT = @EXEEXT@
 version = @version@
 # Substitute an assignment for the MAKE variable, because
@@ -239,6 +237,7 @@
 
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
+/* MYCPPFLAGS only referenced in etc/DEBUG.  */
 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} 
${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} @C_SWITCH_X_SITE@ @C_SWITCH_X_SYSTEM@ 
${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} 
@FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ 
${DEPFLAGS}
 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 
@@ -730,6 +729,7 @@
 buildobj.h: Makefile
        echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
+/* FIXME LOCALCPP not defined or mentioned anywhere.  */
 temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} 
prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
        $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \