summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configs/autoconf.in3
-rw-r--r--configure.ac16
-rw-r--r--src/gallium/drivers/Makefile.am1
-rw-r--r--src/gallium/drivers/r300/Makefile.am1
-rw-r--r--src/gallium/drivers/r600/Makefile.am1
-rw-r--r--src/mesa/Makefile4
-rw-r--r--src/mesa/drivers/dri/common/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/nouveau/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/r200/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/radeon/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/swrast/Makefile.am1
-rw-r--r--src/mesa/libdricore/Makefile.am6
14 files changed, 13 insertions, 26 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 48f4504a234..6deedaa5e5a 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -11,13 +11,12 @@ CC = @CC@
CXX = @CXX@
OPT_FLAGS = @OPT_FLAGS@
ARCH_FLAGS = @ARCH_FLAGS@
-ASM_FLAGS = @ASM_FLAGS@
PIC_FLAGS = @PIC_FLAGS@
DEFINES = @DEFINES@
API_DEFINES = @API_DEFINES@
SHARED_GLAPI = @SHARED_GLAPI@
CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
- $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
+ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 7ba0164e72e..5e2cbd5264e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,6 @@ AC_ARG_ENABLE([asm],
[enable_asm=yes]
)
asm_arch=""
-ASM_FLAGS=""
MESA_ASM_FILES=""
GLAPI_ASM_SOURCES=""
AC_MSG_CHECKING([whether to enable assembly])
@@ -502,19 +501,19 @@ if test "x$enable_asm" = xyes; then
case "$asm_arch" in
x86)
- ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
+ DEFINES="$DEFINES -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
MESA_ASM_FILES='$(X86_FILES)'
GLAPI_ASM_SOURCES='$(X86_API)'
AC_MSG_RESULT([yes, x86])
;;
x86_64)
- ASM_FLAGS="-DUSE_X86_64_ASM"
+ DEFINES="$DEFINES -DUSE_X86_64_ASM"
MESA_ASM_FILES='$(X86_64_FILES)'
GLAPI_ASM_SOURCES='$(X86-64_API)'
AC_MSG_RESULT([yes, x86_64])
;;
sparc)
- ASM_FLAGS="-DUSE_SPARC_ASM"
+ DEFINES="$DEFINES -DUSE_SPARC_ASM"
MESA_ASM_FILES='$(SPARC_FILES)'
GLAPI_ASM_SOURCES='$(SPARC_API)'
AC_MSG_RESULT([yes, sparc])
@@ -524,7 +523,6 @@ if test "x$enable_asm" = xyes; then
;;
esac
fi
-AC_SUBST([ASM_FLAGS])
AC_SUBST([MESA_ASM_FILES])
AC_SUBST([GLAPI_ASM_SOURCES])
@@ -2128,9 +2126,9 @@ AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1
AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1)
-AM_CONDITIONAL(HAVE_X86_ASM, echo "$ASM_FLAGS" | grep 'X86_ASM' >/dev/null 2>&1)
-AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$ASM_FLAGS" | grep 'X86_64_ASM' >/dev/null 2>&1)
-AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$ASM_FLAGS" | grep 'SPARC_ASM' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1)
dnl prepend CORE_DIRS to SRC_DIRS
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
@@ -2303,7 +2301,7 @@ cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
-defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/ */ /;s/ *$//'`
+defines=`echo $DEFINES | $SED 's/^ *//;s/ */ /;s/ *$//'`
echo ""
echo " CFLAGS: $cflags"
echo " CXXFLAGS: $cxxflags"
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 97c5695fa15..409bae0955f 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
$(DEFINES) \
- $(ASM_FLAGS) \
$(PIC_FLAGS)
noinst_LIBRARIES =
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 11f0d18b91f..3d08611752a 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -17,7 +17,6 @@ AM_CFLAGS = \
$(RADEON_CFLAGS) \
$(DEFINES) \
$(ARCH_FLAGS) \
- $(ASM_FLAGS) \
$(OPT_FLAGS) \
$(PIC_FLAGS)
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 31d885a3416..ed89d2adfe9 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -10,7 +10,6 @@ AM_CFLAGS = \
$(RADEON_CFLAGS) \
$(DEFINES) \
$(ARCH_FLAGS) \
- $(ASM_FLAGS) \
$(OPT_FLAGS) \
$(PIC_FLAGS) \
$(VISIBILITY_CFLAGS)
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b0b461fddfc..6ed7166ea83 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -124,10 +124,10 @@ driver_subdirs: $(MESA_LIBS) $(DRICORE_TARGET)
######################################################################
# Assembly subdirs
asm_subdirs:
- @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+ @ if echo "$(DEFINES)" | grep -q USE_X86_ASM ; then \
(cd x86 && $(MAKE)) || exit 1 ; \
fi
- @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+ @ if echo "$(DEFINES)" | grep -q USE_X86_64_ASM ; then \
(cd x86 && $(MAKE)) || exit 1 ; \
(cd x86-64 && $(MAKE)) || exit 1 ; \
fi
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index 27c3e3d4223..d81bc0e3f4d 100644
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -25,7 +25,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(LIBDRM_CFLAGS)
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 75267e22196..7ec4c223149 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -36,7 +36,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(INTEL_CFLAGS)
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index f5dfced9996..c1526aef835 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(INTEL_CFLAGS)
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 3a3c0af9a71..82d3804f838 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -33,7 +33,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(NOUVEAU_CFLAGS)
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index f15dbc09ac2..5ec53de7d3d 100644
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(RADEON_CFLAGS)
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index 89b778d5110..ec2d42e1e01 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES) \
$(RADEON_CFLAGS)
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 3dc7c104440..16a34413bad 100644
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -34,7 +34,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \
- $(ASM_FLAGS) \
$(API_DEFINES)
dridir = $(DRI_DRIVER_INSTALL_DIR)
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 729ddd7c33b..866f8f153b6 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -34,9 +34,9 @@ AM_CPPFLAGS = \
dridir = $(libdir)/dri
-AM_CFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
-AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
-AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
+AM_CFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
+AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE
+AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
libdricore_la_SOURCES = \
$(MESA_FILES) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 09:26:25 +0000