Mercurial > hg > octave-terminal
changeset 15122:ca222e6932b7
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 | 04c881e66740 |
children | 4e0ab3b28418 |
files | build-aux/common.mk |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -117,8 +117,8 @@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ AM_CFLAGS = $(CONFIGURE_CFLAGS) \ - $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) -BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) + $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS) +BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUILD_CC = @BUILD_CC@ BUILD_CFLAGS = @BUILD_CFLAGS@ @@ -140,8 +140,8 @@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ - $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) -BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) + $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS) +BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUILD_CXX = @BUILD_CXX@ BUILD_CXXFLAGS = @BUILD_CXXFLAGS@