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 /lwlib | |
| 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 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 6 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 97ed18691c8..d591b93e50b 100644 --- a/lwlib/ChangeLog +++ b/lwlib/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-08 Jan Djärv <jan.h.d@swipnet.se> * xlwmenu.c (size_menu_item): Change from K&R to prototype. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index eac09174451..13c3f5691f1 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -29,6 +29,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@ CC=@CC@ CFLAGS=@CFLAGS@ @@ -50,7 +52,8 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o # ../src is needed to find config.h. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) $(CFLAGS) \ + $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \ + ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} $(CFLAGS) \ -DHAVE_CONFIG_H -Demacs -I. -I../src -I${srcdir} -I${srcdir}/../src .c.o: |