aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-07 19:11:06 -0700
committerGlenn Morris2010-05-07 19:11:06 -0700
commit7b42b29f3d083ddbbc2588f210d62ae7bc9cf342 (patch)
tree45138b44b4a73eb2d05609df66a69b4ff48a2831
parent40c178792eb1464abede4fd86d3bb394f49e3131 (diff)
downloademacs-7b42b29f3d083ddbbc2588f210d62ae7bc9cf342.tar.gz
emacs-7b42b29f3d083ddbbc2588f210d62ae7bc9cf342.zip
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.
-rw-r--r--admin/CPP-DEFINES3
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in1
-rw-r--r--src/ChangeLog2
-rw-r--r--src/Makefile.in1
5 files changed, 6 insertions, 5 deletions
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
216KERNEL_FILE 216KERNEL_FILE
217LDAV_SYMBOL 217LDAV_SYMBOL
218LIBS_SYSTEM 218LIBS_SYSTEM
219LIBS_TERMCAP
220LIBXMU 219LIBXMU
221LINKER 220LINKER
222LINUX_VERSION_CODE 221LINUX_VERSION_CODE
@@ -279,10 +278,8 @@ SYSV_SYSTEM_DIR
279TAB3 278TAB3
280TABDLY 279TABDLY
281TERM 280TERM
282TERMINFO
283TEXT_START 281TEXT_START
284THIS_IS_CONFIGURE 282THIS_IS_CONFIGURE
285THIS_IS_MAKEFILE
286TIME_WITH_SYS_TIME 283TIME_WITH_SYS_TIME
287TIOCSIGSEND 284TIOCSIGSEND
288TM_IN_SYS_TIME 285TM_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 @@
12010-05-08 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
4
12010-05-06 Glenn Morris <rgm@gnu.org> 52010-05-06 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in: Minimize blessmail-related cpp usage. 7 * 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
164# ========================== start of cpp stuff ======================= 164# ========================== start of cpp stuff =======================
165/* From here on, comments must be done in C syntax. */ 165/* From here on, comments must be done in C syntax. */
166 166
167#define THIS_IS_MAKEFILE
168#define NOT_C_CODE 167#define NOT_C_CODE
169#include "../src/config.h" 168#include "../src/config.h"
170 169
diff --git a/src/ChangeLog b/src/ChangeLog
index 32044fc167b..296c468f2ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-05-08 Glenn Morris <rgm@gnu.org> 12010-05-08 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
4
3 * Makefile.in (LIBS_TERMCAP): Set with configure, not cpp. 5 * Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
4 (TERMCAP_OBJ): New, set by configure, replacing termcapobj. 6 (TERMCAP_OBJ): New, set by configure, replacing termcapobj.
5 (termcapobj): Replace with TERMCAP_OBJ. 7 (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@
170/* just to be sure the sh is used */ 170/* just to be sure the sh is used */
171SHELL=/bin/sh 171SHELL=/bin/sh
172 172
173#define THIS_IS_MAKEFILE
174#define NOT_C_CODE 173#define NOT_C_CODE
175#include "config.h" 174#include "config.h"
176 175