diff options
| author | Karl Heuer | 1995-06-06 01:57:46 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-06-06 01:57:46 +0000 |
| commit | 52ee0561df8e2959a8b9b97b1a35cac9cb78b09d (patch) | |
| tree | c83b562dfe6cf0281b2c01425d627bbf9b973502 /src | |
| parent | 5b827abbf3dad823a13ccf08e0b473da11953f10 (diff) | |
| download | emacs-52ee0561df8e2959a8b9b97b1a35cac9cb78b09d.tar.gz emacs-52ee0561df8e2959a8b9b97b1a35cac9cb78b09d.zip | |
(TOOLKIT_DEFINES): Define.
(ALL_CFLAGS): Insert $(TOOLKIT_DEFINES) here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 20e05d5c5e3..338d6536100 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -239,6 +239,12 @@ LOCALCPP= localcpp | |||
| 239 | SHORT= shortnames | 239 | SHORT= shortnames |
| 240 | #endif | 240 | #endif |
| 241 | 241 | ||
| 242 | #ifdef USE_X_TOOLKIT | ||
| 243 | TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ | ||
| 244 | #else | ||
| 245 | TOOLKIT_DEFINES = | ||
| 246 | #endif | ||
| 247 | |||
| 242 | /* DO NOT use -R. There is a special hack described in lastfile.c | 248 | /* DO NOT use -R. There is a special hack described in lastfile.c |
| 243 | which is used instead. Some initialized data areas are modified | 249 | which is used instead. Some initialized data areas are modified |
| 244 | at initial startup, then labeled as part of the text area when | 250 | at initial startup, then labeled as part of the text area when |
| @@ -252,7 +258,7 @@ SHORT= shortnames | |||
| 252 | 258 | ||
| 253 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM | 259 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM |
| 254 | since it may have -I options that should override those two. */ | 260 | since it may have -I options that should override those two. */ |
| 255 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS} | 261 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS} |
| 256 | .c.o: | 262 | .c.o: |
| 257 | $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< | 263 | $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< |
| 258 | 264 | ||