procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some unused Makefile.in variables.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2010-05-06 00:24:18 -07:00
parent 82db9c90fb
commit e3cf0cded8
12 changed files with 43 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
* 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 <rgm@gnu.org>
* configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE

6
Makefile.in
View file

@ -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@

1
configure.in
View file

@ -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

4
lwlib/ChangeLog
View file

@ -1,3 +1,7 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
* Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
2010-05-04 Glenn Morris <rgm@gnu.org>
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE):

18
lwlib/Makefile.in
View file

@ -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) \

4
msdos/ChangeLog
View file

@ -1,3 +1,7 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
* sed1v2.inp, sed5x.inp: Remove LN_S, unused.
2010-04-01 Eli Zaretskii <eliz@gnu.org>
Remove support for DJGPP v1.x.

5
msdos/sed1v2.inp
View file

@ -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@//

5
msdos/sed5x.inp
View file

@ -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

5
oldXMenu/ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
* 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 <rgm@gnu.org>
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use

27
oldXMenu/Makefile.in
View file

@ -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 \

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
* Makefile.in (CPP, LN_S): Remove unused variables.
2010-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* syntax.c (Fchar_syntax): Check the arg is a character (bug#6080).

4
src/Makefile.in
View file

@ -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} \