diff Makefile.am @ 25593:90d43011e8e7

simplify usage of CFLAGS and CXXFLAGS (bug #48505) * Makefile.am (AM_CFLAGS): Include ${WARN_CFLAGS} in the definition. (AM_CXXFLAGS): Include ${WARN_CXXFLAGS} in the definition. * libgui/graphics/module.mk, libgui/module.mk, libgui/src/module.mk, libinterp/corefcn/module.mk, libinterp/module.mk, libinterp/octave-value/module.mk, libinterp/parse-tree/module.mk, liboctave/array/module.mk, liboctave/external/module.mk, liboctave/module.mk, liboctave/numeric/module.mk, liboctave/operators/module.mk, liboctave/system/module.mk, liboctave/util/module.mk, liboctave/wrappers/module.mk: Delete library-specific CFLAGS and CXXFLAGS settings. * libgui/qterminal-module.mk: Define library-specific CFLAGS and CXXFLAGS variables to avoid using extra warning flags for qterminal code.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Jul 2018 17:20:29 -0400
parents a932bdccdef8
children e1c3d1c6e896
line wrap: on
line diff
--- a/Makefile.am	Thu Jul 12 16:15:50 2018 -0400
+++ b/Makefile.am	Thu Jul 12 17:20:29 2018 -0400
@@ -43,7 +43,7 @@
 
 # C compiler flags.
 
-AM_CFLAGS = ${CPICFLAG} ${XTRA_CFLAGS}
+AM_CFLAGS = ${CPICFLAG} ${XTRA_CFLAGS} ${WARN_CFLAGS}
 
 # ifeq (${INCLUDE_DEPS},no)
 #   omit_deps = true;
@@ -51,7 +51,7 @@
 
 # C++ compiler flags.
 
-AM_CXXFLAGS = ${CXXPICFLAG} ${XTRA_CXXFLAGS}
+AM_CXXFLAGS = ${CXXPICFLAG} ${XTRA_CXXFLAGS} ${WARN_CXXFLAGS}
 
 FFTW_XCPPFLAGS = @FFTW_XCPPFLAGS@
 FFTW_XLDFLAGS = @FFTW_XLDFLAGS@