From e3cf0cded8bed77323873044d2ad2db8d92f3621 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 6 May 2010 00:24:18 -0700 Subject: [PATCH] Remove some unused Makefile.in variables. * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@. * 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. --- ChangeLog | 7 +++++++ Makefile.in | 6 ------ configure.in | 1 - lwlib/ChangeLog | 4 ++++ lwlib/Makefile.in | 18 ++++++------------ msdos/ChangeLog | 4 ++++ msdos/sed1v2.inp | 5 ++--- msdos/sed5x.inp | 5 ++--- oldXMenu/ChangeLog | 5 +++++ oldXMenu/Makefile.in | 27 +++++++-------------------- src/ChangeLog | 4 ++++ src/Makefile.in | 4 ++-- 12 files changed, 43 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3edff34249c..20052004b81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-06 Glenn Morris + + * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@. + + * 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 * configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE diff --git a/Makefile.in b/Makefile.in index cd60e9ee3a0..71d00243fed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,15 +69,9 @@ CDPATH= # ==================== Things `configure' Might Edit ==================== CC=@CC@ -CPP=@CPP@ -C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ -ALLOCA=@ALLOCA@ -LN_S=@LN_S@ CFLAGS=@CFLAGS@ LDFLAGS=@LDFLAGS@ CPPFLAGS=@CPPFLAGS@ -C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ -LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@ EXEEXT=@EXEEXT@ MAKEINFO=@MAKEINFO@ diff --git a/configure.in b/configure.in index c7c880d939e..0bf8bb72b6c 100644 --- a/configure.in +++ b/configure.in @@ -755,7 +755,6 @@ unset SAVE_CFLAGS #### 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 diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 648286e9622..5988977df3a 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2010-05-06 Glenn Morris + + * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables. + 2010-05-04 Glenn Morris * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index c334ef08c78..c72b3920814 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -32,27 +32,21 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ CC=@CC@ CFLAGS=@CFLAGS@ -CPP=@CPP@ CPPFLAGS=@CPPFLAGS@ -LN_S=@LN_S@ RANLIB=@RANLIB@ # See below--@X_TOOLKIT_TYPE@ is used below. USE_X_TOOLKIT=@X_TOOLKIT_TYPE@ - TOP = . +AR = ar cq +RM = rm -f - AR = ar cq - - LN = ln -s - RM = rm -f - - LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o - MOTIF_OBJS = lwlib-Xm.o +LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o +MOTIF_OBJS = lwlib-Xm.o TOOLKIT_DEFINES = - TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) +TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) - 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) \ diff --git a/msdos/ChangeLog b/msdos/ChangeLog index e4baa59ceb7..3d6cd8833d4 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-05-06 Glenn Morris + + * sed1v2.inp, sed5x.inp: Remove LN_S, unused. + 2010-04-01 Eli Zaretskii Remove support for DJGPP v1.x. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 814a633ee2b..84209f59dca 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -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 @@ s/\.h\.in/.h-in/ /^OTHER_FILES *=/s/@OTHER_FILES@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^version *=/s/@[^@\n]*@// -/^LN_S *=/s/@[^@\n]*@/ln -s/ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index 6f2e08d23de..e706b785d7b 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -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/@[^@\n]*@/gcc/ /^CPP *=/s/@[^@\n]*@/gcc -e/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -g/ -/^LN_S *=/s/@[^@\n]*@/ln -s/ s/|| true// # arch-tag: 612a79be-2a02-4cb0-8dec-779aac0a2f4f diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index bf7f7a78247..365ff1f98a9 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,8 @@ +2010-05-06 Glenn Morris + + * 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 * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index bdaa87695e0..b1d6ea5d814 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -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 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ EXTRA=insque.o CC=@CC@ CFLAGS=@CFLAGS@ -CPP=@CPP@ -LN_S=@LN_S@ - 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 \ diff --git a/src/ChangeLog b/src/ChangeLog index 2178f219cf8..cad37cd432b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-06 Glenn Morris + + * Makefile.in (CPP, LN_S): Remove unused variables. + 2010-05-05 Stefan Monnier * syntax.c (Fchar_syntax): Check the arg is a character (bug#6080). diff --git a/src/Makefile.in b/src/Makefile.in index 76a6f777538..08c205f0def 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -37,11 +37,9 @@ srcdir = @srcdir@ 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 @@ shared=no /* 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 @@ ${libsrc}make-docfile${EXEEXT}: 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} \ -- 2.39.2