Mercurial > octave-nkf

comparison 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
comparison
equal deleted inserted replaced
15362:48cb1a5bb64d 15363:482d92904aa4
112 112
113 CC = @CC@ 113 CC = @CC@
114 ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 114 ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12
115 CC_VERSION = @CC_VERSION@ 115 CC_VERSION = @CC_VERSION@
116 GCC_VERSION = @GCC_VERSION@ 116 GCC_VERSION = @GCC_VERSION@
117 CONFIGURE_CFLAGS = @CFLAGS@
118 CPICFLAG = @CPICFLAG@ 117 CPICFLAG = @CPICFLAG@
119 XTRA_CFLAGS = @XTRA_CFLAGS@ 118 XTRA_CFLAGS = @XTRA_CFLAGS@
120 WARN_CFLAGS = @WARN_CFLAGS@ 119 WARN_CFLAGS = @WARN_CFLAGS@
121 AM_CFLAGS = $(CONFIGURE_CFLAGS) \ 120 AM_CFLAGS = $(XTRA_CFLAGS)
122 $(XTRA_CFLAGS) $(WARN_CFLAGS)
123 BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
124 121
125 BUILD_CC = @BUILD_CC@ 122 BUILD_CC = @BUILD_CC@
126 BUILD_CFLAGS = @BUILD_CFLAGS@ 123 BUILD_CFLAGS = @BUILD_CFLAGS@
127 124
128 DEPEND_FLAGS = @DEPEND_FLAGS@ 125 DEPEND_FLAGS = @DEPEND_FLAGS@
137 CXX = @CXX@ 134 CXX = @CXX@
138 ## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12 135 ## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12
139 CXX_VERSION = @CXX_VERSION@ 136 CXX_VERSION = @CXX_VERSION@
140 GXX_VERSION = @GXX_VERSION@ 137 GXX_VERSION = @GXX_VERSION@
141 CXXCPP = @CXXCPP@ 138 CXXCPP = @CXXCPP@
142 CONFIGURE_CXXFLAGS = @CXXFLAGS@
143 CXXPICFLAG = @CXXPICFLAG@ 139 CXXPICFLAG = @CXXPICFLAG@
144 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ 140 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
145 WARN_CXXFLAGS = @WARN_CXXFLAGS@ 141 WARN_CXXFLAGS = @WARN_CXXFLAGS@
146 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ 142 AM_CXXFLAGS = $(XTRA_CXXFLAGS)
147 $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS)
148 BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
149 143
150 BUILD_CXX = @BUILD_CXX@ 144 BUILD_CXX = @BUILD_CXX@
151 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ 145 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
152 146
153 NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@ 147 NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@