diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-12 16:16:38 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-12 16:16:38 +0200 |
| commit | e6cfa7c31f88729a1050e4970c11b8c0c8c1f76c (patch) | |
| tree | 377cd1c649444e409836430f959d77e02c85bf7c /oldXMenu | |
| parent | f09e4c6bcde141d4d10e8de93402821bb7bd1094 (diff) | |
| download | emacs-e6cfa7c31f88729a1050e4970c11b8c0c8c1f76c.tar.gz | |
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.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 6 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index e2edb0afe09..38e9e5d6ed5 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,9 @@ +2010-07-12 Andreas Schwab <schwab@linux-m68k.org> + + * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from + substitution. + (ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}. + 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> * Activate.c: Convert function definitions to standard C. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 5e2e2f6fb9d..8acfee07fd0 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -49,6 +49,8 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ +C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ +PROFILING_CFLAGS = @PROFILING_CFLAGS@ EXTRA=insque.o CC=@CC@ @@ -88,6 +90,7 @@ all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ + ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src |