# HG changeset patch
# User Rik <rik@octave.org>
# Date 1344348594 25200
# Node ID ca222e6932b7db1f85f81d8deeb3faded7844fa8
# Parent  04c881e66740df2f70148618cc5fdd8f8271a4cd
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.

diff -r 04c881e66740 -r ca222e6932b7 build-aux/common.mk
--- a/build-aux/common.mk	Mon Aug 06 21:42:56 2012 -0700
+++ b/build-aux/common.mk	Tue Aug 07 07:09:54 2012 -0700
@@ -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@