[PATCH app-xkbcomp] config: move CWARNFLAGS from configure.ac to Makefile.am

Gaetan Nadon memsize at videotron.ca
Thu Feb 11 17:07:05 PST 2010


Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am  |    2 +-
 configure.ac |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 15ddc27..3550c40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xkbcomp
 
-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS)
 xkbcomp_LDADD = $(XKBCOMP_LIBS)
 
 xkbcomp_SOURCES = \
diff --git a/configure.ac b/configure.ac
index 51457fc..4c86fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,6 @@ AC_CHECK_FUNCS([strdup strcasecmp])
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
-XKBCOMP_CFLAGS="$CWARNFLAGS $XKBCOMP_CFLAGS"
 AC_SUBST(XKBCOMP_CFLAGS)
 AC_SUBST(XKBCOMP_LIBS)
 
-- 
1.6.0.4


List of affected modules to which this patch is applied:

app/beforelight
app/fonttosfnt
app/fslsfonts
app/fstobdf
app/ico
app/oclock
app/rendercheck
app/rgb
app/showfont
app/viewres
app/xcalc
app/xconsole
app/xeyes
app/xfontsel
app/xfsinfo
app/xkbcomp
app/xlogo
app/xlsfonts
app/xmag
app/xmore
app/xrandr
app/xset
app/xsetmode
app/xsm
app/xstdcmap
driver/xf86-input-acecad
driver/xf86-input-aiptek
driver/xf86-input-evdev
driver/xf86-input-joystick
driver/xf86-input-keyboard
driver/xf86-video-siliconmotion




More information about the xorg-devel mailing list