Mercurial > octave-nkf

diff build-aux/common.mk @ 15363:482d92904aa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 648dabbb4c6b
children cabe2fa4566c
line wrap: on
line diff
--- a/build-aux/common.mk	Wed Sep 12 15:08:45 2012 -0400
+++ b/build-aux/common.mk	Wed Sep 12 16:18:48 2012 -0400
@@ -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@