Mercurial > hg > octave-nkf
changeset 15363:482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
* common.mk (AM_CFLAGS): Don't include $(CONFIGURE_CFLAGS) or
$(WARN_CFLAGS) in the list.
(AM_CXXFLAGS): Don't include $(CONFIGURE_CXXFLAGS) or
$(WARN_CXXFLAGS) in the list.
(BUG_CFLAGS, BUG_CXXFLAGS, CONFIGURE_CFLAGS, CONFIGURE_CXXFLAGS):
Delete unused variables.
* libgui/Makefile.am (liboctgui_la_CPPFLAGS): Delete.
* libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS):
Include $(AM_CPPFLAGS) in the list.
(qterminal_libqterminal_la_CFLAGS,
qterminal_libqterminal_la_CXXFLAGS): New variables.
* libgui/src/module.mk (liboctgui_la_CPPFLAGS, liboctgui_la_CFLAGS,
liboctgui_la_CXXFLAGS): New variables.
* liboctave/Makefile.am, src/Makefile.am, libinterp/Makefile.am
(AM_CFLAGS): Append $(WARN_CFLAGS).
(AM_CXXFLAGS): Append $(WARN_CXXFLAGS).
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 12 Sep 2012 16:18:48 -0400 |
parents | 48cb1a5bb64d |
children | d4e3f29aa499 |
files | build-aux/common.mk libgui/Makefile.am libgui/qterminal-module.mk libgui/src/module.mk libinterp/Makefile.am liboctave/Makefile.am src/Makefile.am |
diffstat | 7 files changed, 47 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -114,13 +114,10 @@ ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 CC_VERSION = @CC_VERSION@ GCC_VERSION = @GCC_VERSION@ -CONFIGURE_CFLAGS = @CFLAGS@ CPICFLAG = @CPICFLAG@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ -AM_CFLAGS = $(CONFIGURE_CFLAGS) \ - $(XTRA_CFLAGS) $(WARN_CFLAGS) -BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) +AM_CFLAGS = $(XTRA_CFLAGS) BUILD_CC = @BUILD_CC@ BUILD_CFLAGS = @BUILD_CFLAGS@ @@ -139,13 +136,10 @@ CXX_VERSION = @CXX_VERSION@ GXX_VERSION = @GXX_VERSION@ CXXCPP = @CXXCPP@ -CONFIGURE_CXXFLAGS = @CXXFLAGS@ CXXPICFLAG = @CXXPICFLAG@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ -AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ - $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) -BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) +AM_CXXFLAGS = $(XTRA_CXXFLAGS) BUILD_CXX = @BUILD_CXX@ BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -34,29 +34,6 @@ octlib_LTLIBRARIES = liboctgui.la -liboctgui_la_CPPFLAGS = \ - @OCTGUI_DLL_DEFS@ \ - -I$(QT_INCDIR) \ - -I$(QT_INCDIR)/QtCore \ - -I$(QT_INCDIR)/QtGui \ - -I$(QT_INCDIR)/QtNetwork \ - -I$(srcdir)/qterminal/libqterminal \ - -Isrc -I$(srcdir)/src \ - -I$(srcdir)/src/m-editor \ - -I$(srcdir)/src/octave-adapter \ - -I$(srcdir)/src/qtinfo \ - -I$(top_srcdir)/liboctave/cruft/misc \ - -I$(top_srcdir)/liboctave/array \ - -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ - -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ - -I$(top_srcdir)/liboctave/system \ - -I$(top_srcdir)/liboctave/util \ - -I$(top_srcdir)/libinterp \ - -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ - -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ - -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ - -I$(top_srcdir)/libinterp/octave-value - EXTRA_DIST = default-qt-settings BUILT_SOURCES =
--- a/libgui/qterminal-module.mk +++ b/libgui/qterminal-module.mk @@ -34,11 +34,16 @@ nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) qterminal_libqterminal_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(QT_INCDIR) \ -I$(QT_INCDIR)/QtCore \ -I$(QT_INCDIR)/QtGui \ -I$(srcdir)/qterminal/libqterminal +qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS) + +qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS) + if WIN32_TERMINAL qterminal_libqterminal_la_SOURCES = \
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -131,6 +131,34 @@ src/icons/zoom-in.png \ src/icons/zoom-out.png +liboctgui_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + @OCTGUI_DLL_DEFS@ \ + -I$(QT_INCDIR) \ + -I$(QT_INCDIR)/QtCore \ + -I$(QT_INCDIR)/QtGui \ + -I$(QT_INCDIR)/QtNetwork \ + -I$(srcdir)/qterminal/libqterminal \ + -Isrc -I$(srcdir)/src \ + -I$(srcdir)/src/m-editor \ + -I$(srcdir)/src/octave-adapter \ + -I$(srcdir)/src/qtinfo \ + -I$(top_srcdir)/liboctave/cruft/misc \ + -I$(top_srcdir)/liboctave/array \ + -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ + -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ + -I$(top_srcdir)/liboctave/system \ + -I$(top_srcdir)/liboctave/util \ + -I$(top_srcdir)/libinterp \ + -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ + -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ + -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ + -I$(top_srcdir)/libinterp/octave-value + +liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) + +liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) + noinst_LTLIBRARIES += src/libgui-src.la src_libgui_src_la_SOURCES = $(GUI_SRC_SRC)
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -38,6 +38,10 @@ -Icorefcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu +AM_CFLAGS += $(WARN_CFLAGS) + +AM_CXXFLAGS += $(WARN_CXXFLAGS) + octlib_LTLIBRARIES = liboctinterp.la ## Order matters here. Leave builtins.cc last, because it depends on