summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:06 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:06 -0500
commit2e8280347b96968c847cc4fcf1eee186d458415b (patch)
treedc553f5f011f09391a99747746c5d267318a173c
parent7e3f7e18ac6edbfb515eac97b7646f766d916d85 (diff)
config: move CWARNFLAGS from configure.ac to Makefile.am
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@videotron.ca>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1642d20..9b38781 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ endif
rgbdir = $(db_dir)
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES) $(CWARNFLAGS)
EXTRA_DIST= \
rgb.txt \
diff --git a/configure.ac b/configure.ac
index 2613358..b7f678a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,6 @@ fi
AC_SUBST([RGB_DB_TYPE])
AC_SUBST([RGB_DB_FILES])
AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext])
-RGB_CFLAGS="$CWARNFLAGS $RGB_CFLAGS"
AC_SUBST(RGB_CFLAGS)
AC_OUTPUT([Makefile])