# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1258392728 18000
# Node ID a262b41eaa1533ce4e5fe7bc020167d1b16621e7
# Parent  84398271118ca9b45580b199b0bc01e0b80dd329
common.mk: don't include DLL_CXXDEFS in AM_CXXFLAGS

diff -r 84398271118c -r a262b41eaa15 ChangeLog
--- a/ChangeLog	Sat Nov 14 07:02:30 2009 +0100
+++ b/ChangeLog	Mon Nov 16 12:32:08 2009 -0500
@@ -1,3 +1,9 @@
+2009-11-16  John W. Eaton  <jwe@octave.org>
+
+	* common.mk (AM_CXXFLAGS): Don't include DLL_CXXDEFS in the list.
+	(CONFIGURE_CFLAGS): New variable.
+	(AM_CFLAGS): Define similar to AM_CXXFLAGS.
+
 2009-11-12  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac (AC_CONFIG_FILES): Also generate libcruft/mkf77def.
diff -r 84398271118c -r a262b41eaa15 common.mk
--- a/common.mk	Sat Nov 14 07:02:30 2009 +0100
+++ b/common.mk	Mon Nov 16 12:32:08 2009 -0500
@@ -105,11 +105,12 @@
 
 CC = @CC@
 CC_VERSION = @CC_VERSION@
-AM_CFLAGS = @CFLAGS@
+CONFIGURE_CFLAGS = @CFLAGS@
 CPICFLAG = @CPICFLAG@
 XTRA_CFLAGS = @XTRA_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
-ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
+AM_CFLAGS = $(CONFIGURE_CFLAGS) \
+  $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
 BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
 
 BUILD_CC = @BUILD_CC@
@@ -132,7 +133,7 @@
 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \
-  $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS)
+  $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS)
 BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
 
 BUILD_CXX = @BUILD_CXX@