From d89ef394189831cfb278bbaf318586972a929712 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 21 Feb 2013 16:51:19 -0800 Subject: [PATCH] build: Get rid of dead MESA_ASM_FILES variable Reviewed-by: Eric Anholt --- configure.ac | 5 ----- src/mesa/Makefile.am | 1 - 2 files changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index 5bc0684b15d..5118b8e4237 100644 --- a/configure.ac +++ b/configure.ac @@ -433,7 +433,6 @@ AC_ARG_ENABLE([asm], [enable_asm=yes] ) asm_arch="" -MESA_ASM_FILES="" AC_MSG_CHECKING([whether to enable assembly]) test "x$enable_asm" = xno && AC_MSG_RESULT([no]) # disable if cross compiling on x86/x86_64 since we must run gen_matypes @@ -474,17 +473,14 @@ if test "x$enable_asm" = xyes; then case "$asm_arch" in x86) DEFINES="$DEFINES -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM" - MESA_ASM_FILES='$(X86_FILES)' AC_MSG_RESULT([yes, x86]) ;; x86_64) DEFINES="$DEFINES -DUSE_X86_64_ASM" - MESA_ASM_FILES='$(X86_64_FILES)' AC_MSG_RESULT([yes, x86_64]) ;; sparc) DEFINES="$DEFINES -DUSE_SPARC_ASM" - MESA_ASM_FILES='$(SPARC_FILES)' AC_MSG_RESULT([yes, sparc]) ;; *) @@ -492,7 +488,6 @@ if test "x$enable_asm" = xyes; then ;; esac fi -AC_SUBST([MESA_ASM_FILES]) dnl Check to see if dlopen is in default libraries (like Solaris, which dnl has it in libc), or if libdl is needed to get it. diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 41483dd63e8..c341c48e799 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -87,7 +87,6 @@ AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS) -# cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution MESA_ASM_FILES_FOR_ARCH = if HAVE_X86_ASM -- 2.30.2