automake: Remove OPT_FLAGS.

If you want to change your compiler arguments, just set CFLAGS/CXXFLAGS.
Having Mesa have this separate variable is a great way to have your arguments
not thoroughly propagated to all compiler invocations.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/configs/current.in b/configs/current.in
index 1840632..c4f3f4d 100644 (file)
--- a/configs/current.in
+++ b/configs/current.in
@@ -9,15 +9,14 @@ CONFIG_NAME = autoconf
 # Compiler and flags
 CC = @CC@
 CXX = @CXX@
-OPT_FLAGS = @OPT_FLAGS@
 PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@
 API_DEFINES = @API_DEFINES@
 SHARED_GLAPI = @SHARED_GLAPI@
 CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES)
+       $(PIC_FLAGS) $(DEFINES)
 CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES)
+       $(PIC_FLAGS) $(DEFINES)
 CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
 CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
 LDFLAGS = @LDFLAGS@

diff --git a/configure.ac b/configure.ac
index c81d18b..47b9187 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,11 +246,6 @@ esac
 AC_SUBST([VISIBILITY_CFLAGS])
 AC_SUBST([VISIBILITY_CXXFLAGS])
 
-dnl These should be unnecessary, but let the user set them if they want
-AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.
-    Default is to use CFLAGS.])
-AC_SUBST([OPT_FLAGS])
-
 dnl
 dnl Hacks to enable 32 or 64 bit build
 dnl
@@ -2301,9 +2296,9 @@ echo "        Static libs:     $enable_static"
 
 dnl Compiler options
 # cleanup the CFLAGS/CXXFLAGS/DEFINES vars
-cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS | \
+cflags=`echo $CFLAGS $PIC_FLAGS | \
     $SED 's/^ *//;s/  */ /;s/ *$//'`
-cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS | \
+cxxflags=`echo $CXXFLAGS $PIC_FLAGS | \
     $SED 's/^ *//;s/  */ /;s/ *$//'`
 defines=`echo $DEFINES | $SED 's/^ *//;s/  */ /;s/ *$//'`
 echo ""

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index ca2b6c0..79b17f6 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -16,7 +16,6 @@ AM_CFLAGS = \
        $(LLVM_CFLAGS) \
        $(RADEON_CFLAGS) \
        $(DEFINES) \
-       $(OPT_FLAGS) \
        $(PIC_FLAGS)
 
 libr300_a_SOURCES = \

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 65d0dff..628eaab 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -9,7 +9,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/include \
        $(RADEON_CFLAGS) \
        $(DEFINES) \
-       $(OPT_FLAGS) \
        $(PIC_FLAGS) \
        $(VISIBILITY_CFLAGS)