Mercurial > emacs
comparison src/Makefile.in @ 109359:b7e047772c64
Properly handle C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS
* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Substitute, don't add them to CFLAGS/LDFLAGS.
(C_OPTIMIZE_SWITCH): Remove.
(TEMACS_LDFLAGS2): Add ${PROFILING_LDFLAGS}.
* lib-src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(BASE_CFLAGS): Add ${C_WARNINGS_SWITCH}.
(ALL_CFLAGS, CPP_CFLAGS): Add ${PROFILING_CFLAGS}.
(LINK_CFLAGS): Add ${PROFILING_LDFLAGS}.
* lwlib/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(ALL_CFLAGS): Add C_WARNINGS_SWITCH and PROFILING_CFLAGS, put
CFLAGS last.
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Mon, 12 Jul 2010 16:16:38 +0200 |
parents | 09daf1538316 |
children | 3226ac2da7f7 |
comparison
equal
deleted
inserted
replaced
109357:3cfd17e4be81 | 109359:b7e047772c64 |
---|---|
61 ## ns-app if HAVE_NS, else empty. | 61 ## ns-app if HAVE_NS, else empty. |
62 OTHER_FILES = @OTHER_FILES@ | 62 OTHER_FILES = @OTHER_FILES@ |
63 | 63 |
64 CRT_DIR=@CRT_DIR@ | 64 CRT_DIR=@CRT_DIR@ |
65 | 65 |
66 ## Flags to pass for profiling builds | |
67 PROFILING_CFLAGS = @PROFILING_CFLAGS@ | |
68 PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ | |
69 | |
70 ## Flags to pass to the compiler to enable build warnings | |
71 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ | |
72 | |
66 ## Machine-specific CFLAGS. | 73 ## Machine-specific CFLAGS. |
67 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | 74 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ |
68 ## System-specific CFLAGS. | 75 ## System-specific CFLAGS. |
69 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 76 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
70 | 77 |
105 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ | 112 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ |
106 | 113 |
107 ## Flags to pass to ld only for temacs. | 114 ## Flags to pass to ld only for temacs. |
108 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) | 115 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) |
109 | 116 |
110 ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). | 117 ## $LDFLAGS $PROFILING_LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). |
111 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ | 118 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |
112 | 119 |
113 ## Some systems define this to request special libraries. | 120 ## Some systems define this to request special libraries. |
114 LIBS_SYSTEM=@LIBS_SYSTEM@ | 121 LIBS_SYSTEM=@LIBS_SYSTEM@ |
115 | 122 |
307 ## | 314 ## |
308 ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. | 315 ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. |
309 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} \ | 316 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} \ |
310 ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} \ | 317 ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} \ |
311 ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} \ | 318 ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} \ |
312 ${GCONF_CFLAGS} ${CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} \ | 319 ${GCONF_CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} \ |
313 ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} | 320 ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} ${PROFILING_CFLAGS} \ |
321 ${C_WARNINGS_SWITCH} ${CFLAGS} | |
314 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) | 322 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) |
315 | 323 |
316 .SUFFIXES: .m | 324 .SUFFIXES: .m |
317 .c.o: | 325 .c.o: |
318 @$(MKDEPDIR) | 326 @$(MKDEPDIR) |