Mercurial > octave

changeset 25593:90d43011e8e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 053502516f38
children deb8cb929ee3
files Makefile.am libgui/graphics/module.mk libgui/module.mk libgui/qterminal-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
diffstat 17 files changed, 5 insertions(+), 62 deletions(-) [+]
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@
--- a/libgui/graphics/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libgui/graphics/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -146,10 +146,6 @@
   -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \
   -I$(srcdir)/libinterp/octave-value
 
-%canon_reldir%_%canon_reldir%_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_%canon_reldir%_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 noinst_LTLIBRARIES += %reldir%/libgui-graphics.la
 
 libgui_EXTRA_DIST += \
--- a/libgui/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libgui/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -50,10 +50,6 @@
   -Ilibgui \
   -I$(srcdir)/libgui
 
-%canon_reldir%_liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 %canon_reldir%_liboctgui_la_LIBADD = \
   %reldir%/qterminal/libqterminal.la \
   %reldir%/src/libgui-src.la \
--- a/libgui/qterminal-module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libgui/qterminal-module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -45,9 +45,9 @@
   -I$(srcdir)/libgui/qterminal/libqterminal \
   -I$(srcdir)/libgui/src
 
-libgui_qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS)
+libgui_qterminal_libqterminal_la_CFLAGS = ${CPICFLAG} ${XTRA_CFLAGS}
 
-libgui_qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS)
+libgui_qterminal_libqterminal_la_CXXFLAGS = ${CXXPICFLAG} ${XTRA_CXXFLAGS}
 
 if WIN32_TERMINAL
 
--- a/libgui/src/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libgui/src/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -250,10 +250,6 @@
   -I$(srcdir)/libinterp/octave-value \
   -I$(srcdir)/liboctave/wrappers
 
-%canon_reldir%_%canon_reldir%_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_%canon_reldir%_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 noinst_LTLIBRARIES += %reldir%/libgui-src.la
 
 libgui_EXTRA_DIST += \
--- a/libinterp/corefcn/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libinterp/corefcn/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -316,9 +316,7 @@
   $(LLVM_CPPFLAGS) \
   $(Z_CPPFLAGS)
 
-%canon_reldir%_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) $(LLVM_CXXFLAGS)
+%canon_reldir%_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS)
 
 libinterp_EXTRA_DIST += \
   %reldir%/default-defs.in.h \
--- a/libinterp/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libinterp/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -22,10 +22,6 @@
   $(HDF5_CPPFLAGS) \
   $(MAGICK_CPPFLAGS)
 
-%canon_reldir%_liboctinterp_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_liboctinterp_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 octlib_LTLIBRARIES += %reldir%/liboctinterp.la
 
 %canon_reldir%_pkgconfig_DATA = %reldir%/octinterp.pc
--- a/libinterp/octave-value/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libinterp/octave-value/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -146,8 +146,4 @@
   $(HDF5_CPPFLAGS) \
   $(JAVA_CPPFLAGS)
 
-%canon_reldir%_liboctave_value_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_liboctave_value_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 %canon_reldir%_liboctave_value_la_LIBADD = $(JAVA_LIBS)
--- a/libinterp/parse-tree/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/libinterp/parse-tree/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -116,13 +116,8 @@
   $(libinterp_liboctinterp_la_CPPFLAGS) \
   $(LLVM_CPPFLAGS)
 
-%canon_reldir%_libparse_tree_la_CFLAGS = \
-  $(AM_CFLAGS) \
-  $(WARN_CFLAGS)
-
 %canon_reldir%_libparse_tree_la_CXXFLAGS = \
   $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS) \
   $(LLVM_CXXFLAGS)
 
 libinterp_EXTRA_DIST += \
--- a/liboctave/array/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/array/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -132,8 +132,4 @@
   $(FFTW_XCPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
-%canon_reldir%_libarray_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_libarray_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/libarray.la
--- a/liboctave/external/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/external/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -37,10 +37,6 @@
 
 %canon_reldir%_libexternal_la_CPPFLAGS = $(liboctave_liboctave_la_CPPFLAGS)
 
-%canon_reldir%_libexternal_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_libexternal_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/libexternal.la
 
 liboctave_EXTRA_DIST += \
--- a/liboctave/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -23,10 +23,6 @@
   -I$(srcdir)/%reldir%/util \
   -I$(srcdir)/%reldir%/wrappers
 
-%canon_reldir%_%canon_reldir%_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
-
-%canon_reldir%_%canon_reldir%_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
-
 octlib_LTLIBRARIES += %reldir%/liboctave.la
 
 %canon_reldir%_pkgconfig_DATA = %reldir%/octave.pc
--- a/liboctave/numeric/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/numeric/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -120,10 +120,6 @@
   $(FFTW_XCPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
-%canon_reldir%_libnumeric_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_libnumeric_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/libnumeric.la
 
 liboctave_EXTRA_DIST += $(LIBOCTAVE_OPT_IN)
--- a/liboctave/operators/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/operators/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -82,10 +82,6 @@
 
 %canon_reldir%_liboperators_la_CPPFLAGS = $(liboctave_liboctave_la_CPPFLAGS)
 
-%canon_reldir%_liboperators_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_liboperators_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/liboperators.la
 
 liboctave_EXTRA_DIST += \
--- a/liboctave/system/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/system/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -38,8 +38,4 @@
 
 %canon_reldir%_libsystem_la_CPPFLAGS = $(liboctave_liboctave_la_CPPFLAGS)
 
-%canon_reldir%_libsystem_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_libsystem_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/libsystem.la
--- a/liboctave/util/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/util/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -109,10 +109,6 @@
   $(PCRE_CPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
-%canon_reldir%_libutil_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
-%canon_reldir%_libutil_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
-
 %canon_reldir%_libutil_la_FFLAGS = $(F77_INTEGER_8_FLAG)
 
 liboctave_liboctave_la_LIBADD += %reldir%/libutil.la
--- a/liboctave/wrappers/module.mk	Thu Jul 12 16:15:50 2018 -0400
+++ b/liboctave/wrappers/module.mk	Thu Jul 12 17:20:29 2018 -0400
@@ -90,6 +90,4 @@
 %canon_reldir%_libwrappers_la_CPPFLAGS = \
   -Ilibgnu -I$(srcdir)/libgnu
 
-%canon_reldir%_libwrappers_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
-
 liboctave_liboctave_la_LIBADD += %reldir%/libwrappers.la