From 44b031a6b00d435deab1ba36cf4a80183c0fe5aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 11 May 2010 20:06:50 -0700 Subject: [PATCH] Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES. * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. * lib-src/Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. * msdos/sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@. --- ChangeLog | 2 ++ configure.in | 1 - lib-src/ChangeLog | 4 ++++ lib-src/Makefile.in | 2 +- msdos/ChangeLog | 2 ++ msdos/sed3v2.inp | 1 - 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 831fc2263f..b1b4a39e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-05-12 Glenn Morris + * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. + * configure.in (LIB_GCC): New output variable. 2010-05-11 Glenn Morris diff --git a/configure.in b/configure.in index 3a0067ecec..491c3af9dc 100644 --- a/configure.in +++ b/configure.in @@ -3050,7 +3050,6 @@ AC_SUBST(GNUSTEP_MAKEFILES) AC_SUBST(GNUSTEP_SYSTEM_HEADERS) AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) AC_SUBST(GNU_OBJC_CFLAGS) -AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES) AC_SUBST(OTHER_FILES) AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 64cc3dde93..36e2f29e58 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-12 Glenn Morris + + * Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. + 2010-05-11 Glenn Morris * Makefile.in (.m.o): Remove, there are no .m files. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index c8f9042f9f..4799a9fefc 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -108,7 +108,7 @@ INSTALL_STRIP = # Things that a user might actually run, # which should be installed in bindir. -INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@ +INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog # Things that Emacs runs internally, or during the build process, diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 8ce1b625fc..e4e77c5f10 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,7 @@ 2010-05-12 Glenn Morris + * sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@. + * sed1v2.inp (LIB_GCC): Edit to -Lgcc. 2010-05-11 Glenn Morris diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index d5a4a3335b..323029ecf3 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -45,7 +45,6 @@ /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! /^INSTALLABLES/s/emacsclient *// -/^INSTALLABLES/s/ @LIB_SRC_EXTRA_INSTALLABLES@// s!^ \./! ! /^UTILITIES=/s/ wakeup// /^UTILITIES=/s/ movemail// -- 2.20.1