Mercurial > octave

comparison build-aux/common.mk @ 15122:ca222e6932b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove DEFS and CXXFLAGS/CFLAGS from AM_CXXFLAGS/AM_CFLAGS causing duplicate options in compile command. * build-aux/common.mk: Remove DEFS and CXXFLAGS/CFLAGS from AM_CXXFLAGS/AM_CFLAGS causing duplicate options in compile command.
author Rik <rik@octave.org>
date Tue, 07 Aug 2012 07:09:54 -0700
parents 8523df595d42
children 4e0ab3b28418
comparison
equal deleted inserted replaced
15121:04c881e66740 15122:ca222e6932b7
115 CONFIGURE_CFLAGS = @CFLAGS@ 115 CONFIGURE_CFLAGS = @CFLAGS@
116 CPICFLAG = @CPICFLAG@ 116 CPICFLAG = @CPICFLAG@
117 XTRA_CFLAGS = @XTRA_CFLAGS@ 117 XTRA_CFLAGS = @XTRA_CFLAGS@
118 WARN_CFLAGS = @WARN_CFLAGS@ 118 WARN_CFLAGS = @WARN_CFLAGS@
119 AM_CFLAGS = $(CONFIGURE_CFLAGS) \ 119 AM_CFLAGS = $(CONFIGURE_CFLAGS) \
120 $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) 120 $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
121 BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) 121 BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
122 122
123 BUILD_CC = @BUILD_CC@ 123 BUILD_CC = @BUILD_CC@
124 BUILD_CFLAGS = @BUILD_CFLAGS@ 124 BUILD_CFLAGS = @BUILD_CFLAGS@
125 125
126 DEPEND_FLAGS = @DEPEND_FLAGS@ 126 DEPEND_FLAGS = @DEPEND_FLAGS@
138 CONFIGURE_CXXFLAGS = @CXXFLAGS@ 138 CONFIGURE_CXXFLAGS = @CXXFLAGS@
139 CXXPICFLAG = @CXXPICFLAG@ 139 CXXPICFLAG = @CXXPICFLAG@
140 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ 140 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
141 WARN_CXXFLAGS = @WARN_CXXFLAGS@ 141 WARN_CXXFLAGS = @WARN_CXXFLAGS@
142 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ 142 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \
143 $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) 143 $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS)
144 BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) 144 BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
145 145
146 BUILD_CXX = @BUILD_CXX@ 146 BUILD_CXX = @BUILD_CXX@
147 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ 147 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
148 148
149 NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@ 149 NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@