diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index dfd322553b8..552dd2e50ae 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -377,14 +377,11 @@ endif | |||
| 377 | # Flags that might be in WARN_CFLAGS but are not valid for Objective C. | 377 | # Flags that might be in WARN_CFLAGS but are not valid for Objective C. |
| 378 | NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd | 378 | NON_OBJC_CFLAGS = -Wignored-attributes -Wignored-qualifiers -Wopenmp-simd |
| 379 | 379 | ||
| 380 | # Cajole GCC into inlining key ops even if it wouldn't normally. | ||
| 381 | KEY_OPS_CFLAGS = $(if $(filter -Og,$(CFLAGS)),-DDEFINE_KEY_OPS_AS_MACROS) | ||
| 382 | |||
| 383 | # -Demacs makes some files produce the correct version for use in Emacs. | 380 | # -Demacs makes some files produce the correct version for use in Emacs. |
| 384 | # MYCPPFLAGS is for by-hand Emacs-specific overrides, e.g., | 381 | # MYCPPFLAGS is for by-hand Emacs-specific overrides, e.g., |
| 385 | # "make MYCPPFLAGS='-DDBUS_DEBUG'". | 382 | # "make MYCPPFLAGS='-DDBUS_DEBUG'". |
| 386 | EMACS_CFLAGS = -Demacs $(KEY_OPS_CFLAGS) $(MYCPPFLAGS) \ | 383 | EMACS_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ |
| 387 | -I. -I$(srcdir) -I$(lib) -I$(top_srcdir)/lib \ | 384 | -I$(lib) -I$(top_srcdir)/lib \ |
| 388 | $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ | 385 | $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ |
| 389 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ | 386 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ |
| 390 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ | 387 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ |