Mercurial > hg > octave-terminal
changeset 15152:c9e14ab3c3de
build: Remove unused variable INCFLAGS from AM_C[XX}_FLAGS and Octave.
common.mk: Remove unused variable INCFLAGS from AM_C[XX}_FLAGS and Octave.
toplev.cc (Foctave_config_info): Remove unused variable INCFLAGS from code.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 10 Aug 2012 16:23:41 -0700 |
parents | 8bba043342ab |
children | ba431d1106e3 |
files | build-aux/common.mk src/interpfcn/toplev.cc |
diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -117,7 +117,7 @@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ AM_CFLAGS = $(CONFIGURE_CFLAGS) \ - $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) + $(XTRA_CFLAGS) $(WARN_CFLAGS) BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUILD_CC = @BUILD_CC@ @@ -140,7 +140,7 @@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ - $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) + $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUILD_CXX = @BUILD_CXX@ @@ -529,7 +529,6 @@ -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_INCFLAGS%|\"${INCFLAGS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \ -e "s|%OCTAVE_CONF_LAPACK_LIBS%|\"${LAPACK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \
--- a/src/interpfcn/toplev.cc +++ b/src/interpfcn/toplev.cc @@ -1307,7 +1307,6 @@ { false, "HDF5_CPPFLAGS", OCTAVE_CONF_HDF5_CPPFLAGS }, { false, "HDF5_LDFLAGS", OCTAVE_CONF_HDF5_LDFLAGS }, { false, "HDF5_LIBS", OCTAVE_CONF_HDF5_LIBS }, - { false, "INCFLAGS", OCTAVE_CONF_INCFLAGS }, { false, "LAPACK_LIBS", OCTAVE_CONF_LAPACK_LIBS }, { false, "LDFLAGS", OCTAVE_CONF_LDFLAGS }, { false, "LD_CXX", OCTAVE_CONF_LD_CXX },