diff options
| author | Juanma Barranquero | 2003-01-21 21:36:15 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-01-21 21:36:15 +0000 |
| commit | 46cf0bede329b92df7748f69b6204e2bffefceb2 (patch) | |
| tree | e4fe4b448afc8207decbb61b4b32b912de1f267c | |
| parent | 44f5a7b27722a958dcbf6cae5fabe5fb38892c99 (diff) | |
| download | emacs-46cf0bede329b92df7748f69b6204e2bffefceb2.tar.gz emacs-46cf0bede329b92df7748f69b6204e2bffefceb2.zip | |
(ALL_CFLAGS): Include MYCPPFLAGS, not MYCPPFLAG.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 270a3d2e434..b8c445aba3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2003-01-21 Richard Dawe <rich@phekda.freeserve.co.uk> (tiny change) | ||
| 2 | |||
| 3 | * Makefile.in (ALL_CFLAGS): Include MYCPPFLAGS, not MYCPPFLAG. | ||
| 4 | |||
| 1 | 2003-01-21 Jan D. <jan.h.d@swipnet.se> | 5 | 2003-01-21 Jan D. <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * gtkutil.c: Must include stdio.h before termhooks.h | 7 | * gtkutil.c: Must include stdio.h before termhooks.h |
| @@ -124,7 +128,6 @@ | |||
| 124 | (x_window): Call xg_create_frame_widgets for USE_GTK. | 128 | (x_window): Call xg_create_frame_widgets for USE_GTK. |
| 125 | (Fx_create_frame): Check for USE_GTK | 129 | (Fx_create_frame): Check for USE_GTK |
| 126 | (Fx_file_dialog): New implementation for USE_GTK. | 130 | (Fx_file_dialog): New implementation for USE_GTK. |
| 127 | |||
| 128 | 131 | ||
| 129 | * xdisp.c: Add check for USE_GTK for extern void set_frame_menubar. | 132 | * xdisp.c: Add check for USE_GTK for extern void set_frame_menubar. |
| 130 | (update_menu_bar): Add check for USE_GTK. | 133 | (update_menu_bar): Add check for USE_GTK. |
diff --git a/src/Makefile.in b/src/Makefile.in index 0a65e83bc5c..320b3e5874a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -279,7 +279,7 @@ TOOLKIT_DEFINES = | |||
| 279 | 279 | ||
| 280 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM | 280 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM |
| 281 | since it may have -I options that should override those two. */ | 281 | since it may have -I options that should override those two. */ |
| 282 | 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 C_SWITCH_SYSTEM_TEMACS ${CFLAGS} | 282 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS} |
| 283 | .c.o: | 283 | .c.o: |
| 284 | $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< | 284 | $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< |
| 285 | 285 | ||