Mercurial > octave-nkf
diff build-aux/common.mk @ 15154:d8a10cae1dcd gui
maint: periodic merge of default to gui
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 11 Aug 2012 09:36:47 -0400 |
| parents | 089b98bdaebf c9e14ab3c3de |
| children | 1c711a646fa7 |
line wrap: on
line diff
--- a/build-aux/common.mk Fri Aug 10 18:07:24 2012 -0400 +++ b/build-aux/common.mk Sat Aug 11 09:36:47 2012 -0400 @@ -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}\"|" \