Mercurial > octave

changeset 25596:e65dc7a2de42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: simplify usage of CXXFLAGS for programs (bug #48505) * src/module.mk: Delete program-specific CXXFLAGS variables.
author Mike Miller <mtmiller@octave.org>
date Thu, 12 Jul 2018 16:36:28 -0700
parents 12bb7bd389fc
children 6e6b5e85e08a
files src/module.mk
diffstat 1 files changed, 0 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/module.mk	Thu Jul 12 16:11:53 2018 -0700
+++ b/src/module.mk	Thu Jul 12 16:36:28 2018 -0700
@@ -78,10 +78,6 @@
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-%canon_reldir%_octave_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS)
-
 %canon_reldir%_octave_cli_SOURCES = %reldir%/main-cli.cc
 nodist_%canon_reldir%_octave_cli_SOURCES = %reldir%/octave-build-info.cc
 
@@ -98,10 +94,6 @@
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-%canon_reldir%_octave_cli_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS)
-
 if AMCOND_BUILD_QT_GUI
   %canon_reldir%_octave_gui_SOURCES = %reldir%/main-gui.cc
   nodist_%canon_reldir%_octave_gui_SOURCES = %reldir%/octave-build-info.cc
@@ -123,10 +115,6 @@
   $(OCTAVE_GUI_LINK_OPTS) \
   $(WARN_LDFLAGS)
 
-%canon_reldir%_octave_gui_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS)
-
 %canon_reldir%_mkoctfile_SOURCES =
 
 nodist_%canon_reldir%_mkoctfile_SOURCES = %reldir%/mkoctfile.cc
@@ -139,10 +127,6 @@
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-%canon_reldir%_mkoctfile_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS)
-
 %canon_reldir%_octave_config_SOURCES =
 
 nodist_%canon_reldir%_octave_config_SOURCES = %reldir%/octave-config.cc
@@ -156,10 +140,6 @@
   $(SRC_DIR_CPPFLAGS) \
   $(OCTAVE_CPPFLAGS)
 
-%canon_reldir%_octave_config_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(WARN_CXXFLAGS)
-
 DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
 
 mostlyclean-local: src-mostlyclean-local