From: Glenn Morris Date: Sat, 8 May 2010 02:11:06 +0000 (-0700) Subject: Remove unused Makefile definition THIS_IS_MAKEFILE. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~230 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b42b29f3d083ddbbc2588f210d62ae7bc9cf342;p=emacs.git Remove unused Makefile definition THIS_IS_MAKEFILE. * src/Makefile.in (THIS_IS_MAKEFILE): Remove, unused. * lib-sc/Makefile.in (THIS_IS_MAKEFILE): Remove, unused. * admin/CPP-DEFINES (THIS_IS_MAKEFILE): Remove. --- diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index ab78d1b8c5f..6721fdec260 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -216,7 +216,6 @@ IS_DIRECTORY_SEP KERNEL_FILE LDAV_SYMBOL LIBS_SYSTEM -LIBS_TERMCAP LIBXMU LINKER LINUX_VERSION_CODE @@ -279,10 +278,8 @@ SYSV_SYSTEM_DIR TAB3 TABDLY TERM -TERMINFO TEXT_START THIS_IS_CONFIGURE -THIS_IS_MAKEFILE TIME_WITH_SYS_TIME TIOCSIGSEND TM_IN_SYS_TIME diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 1424f0dc5f7..dcfcf611b90 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-08 Glenn Morris + + * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. + 2010-05-06 Glenn Morris * Makefile.in: Minimize blessmail-related cpp usage. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index a97682ae763..73953211cd4 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -164,7 +164,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -#define THIS_IS_MAKEFILE #define NOT_C_CODE #include "../src/config.h" diff --git a/src/ChangeLog b/src/ChangeLog index 32044fc167b..296c468f2ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-08 Glenn Morris + * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. + * Makefile.in (LIBS_TERMCAP): Set with configure, not cpp. (TERMCAP_OBJ): New, set by configure, replacing termcapobj. (termcapobj): Replace with TERMCAP_OBJ. diff --git a/src/Makefile.in b/src/Makefile.in index 40ede77078b..f956d03e337 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -170,7 +170,6 @@ START_FILES = @START_FILES@ /* just to be sure the sh is used */ SHELL=/bin/sh -#define THIS_IS_MAKEFILE #define NOT_C_CODE #include "config.h"