diff options
| author | Glenn Morris | 2010-05-07 19:11:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-07 19:11:06 -0700 |
| commit | 7b42b29f3d083ddbbc2588f210d62ae7bc9cf342 (patch) | |
| tree | 45138b44b4a73eb2d05609df66a69b4ff48a2831 | |
| parent | 40c178792eb1464abede4fd86d3bb394f49e3131 (diff) | |
| download | emacs-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-DEFINES | 3 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 1 |
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 | |||
| 216 | KERNEL_FILE | 216 | KERNEL_FILE |
| 217 | LDAV_SYMBOL | 217 | LDAV_SYMBOL |
| 218 | LIBS_SYSTEM | 218 | LIBS_SYSTEM |
| 219 | LIBS_TERMCAP | ||
| 220 | LIBXMU | 219 | LIBXMU |
| 221 | LINKER | 220 | LINKER |
| 222 | LINUX_VERSION_CODE | 221 | LINUX_VERSION_CODE |
| @@ -279,10 +278,8 @@ SYSV_SYSTEM_DIR | |||
| 279 | TAB3 | 278 | TAB3 |
| 280 | TABDLY | 279 | TABDLY |
| 281 | TERM | 280 | TERM |
| 282 | TERMINFO | ||
| 283 | TEXT_START | 281 | TEXT_START |
| 284 | THIS_IS_CONFIGURE | 282 | THIS_IS_CONFIGURE |
| 285 | THIS_IS_MAKEFILE | ||
| 286 | TIME_WITH_SYS_TIME | 283 | TIME_WITH_SYS_TIME |
| 287 | TIOCSIGSEND | 284 | TIOCSIGSEND |
| 288 | TM_IN_SYS_TIME | 285 | 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 @@ | |||
| 1 | 2010-05-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. | ||
| 4 | |||
| 1 | 2010-05-06 Glenn Morris <rgm@gnu.org> | 5 | 2010-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 @@ | |||
| 1 | 2010-05-08 Glenn Morris <rgm@gnu.org> | 1 | 2010-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 */ |
| 171 | SHELL=/bin/sh | 171 | SHELL=/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 | ||