Module: Mesa
Branch: master
Commit: 7d7fe1b0376d5017c21351c0df8168b733801570
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d7fe1b0376d5017c21351c0df8168b733801570
Author: Eric Anholt <e...@anholt.net>
Date: Wed May 16 09:09:18 2012 -0700
automake: Rename variables in sources.mak to be automake compatible.
*_SOURCES is reserved for files lists for particular automake targets.
Also, "-" in the variable names is not allowed.
Reviewed-by: Matt Turner <matts...@gmail.com>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
---
configs/autoconf.in | 2 +-
configs/default | 2 +-
configure.ac | 10 ++--
src/mesa/Android.mk | 20 +++++-----
src/mesa/Makefile | 6 +-
src/mesa/sources.mak | 108 +++++++++++++++++++++++++-------------------------
6 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3c8f4c1..38f49a2 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -47,7 +47,7 @@ DRI_CXXFLAGS = @DRI_CXXFLAGS@
DLOPEN_LIBS = @DLOPEN_LIBS@
# Source selection
-MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
+MESA_ASM_FILES = @MESA_ASM_FILES@
GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
# Misc tools and flags
diff --git a/configs/default b/configs/default
index 40fa5e3..0f8b09f 100644
--- a/configs/default
+++ b/configs/default
@@ -89,7 +89,7 @@ DRI_CFLAGS = $(CFLAGS)
DRI_CXXFLAGS = $(CXXFLAGS)
# Optional assembly language optimization files for libGL
-MESA_ASM_SOURCES =
+MESA_ASM_FILES =
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
diff --git a/configure.ac b/configure.ac
index ca2220f..6830bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,7 +436,7 @@ AC_ARG_ENABLE([asm],
)
asm_arch=""
ASM_FLAGS=""
-MESA_ASM_SOURCES=""
+MESA_ASM_FILES=""
GLAPI_ASM_SOURCES=""
AC_MSG_CHECKING([whether to enable assembly])
test "x$enable_asm" = xno && AC_MSG_RESULT([no])
@@ -485,19 +485,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"
- MESA_ASM_SOURCES='$(X86_SOURCES)'
+ MESA_ASM_FILES='$(X86_FILES)'
GLAPI_ASM_SOURCES='$(X86_API)'
AC_MSG_RESULT([yes, x86])
;;
x86_64)
ASM_FLAGS="-DUSE_X86_64_ASM"
- MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+ MESA_ASM_FILES='$(X86_64_FILES)'
GLAPI_ASM_SOURCES='$(X86-64_API)'
AC_MSG_RESULT([yes, x86_64])
;;
sparc)
ASM_FLAGS="-DUSE_SPARC_ASM"
- MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+ MESA_ASM_FILES='$(SPARC_FILES)'
GLAPI_ASM_SOURCES='$(SPARC_API)'
AC_MSG_RESULT([yes, sparc])
;;
@@ -507,7 +507,7 @@ if test "x$enable_asm" = xyes; then
esac
fi
AC_SUBST([ASM_FLAGS])
-AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([MESA_ASM_FILES])
AC_SUBST([GLAPI_ASM_SOURCES])
dnl PIC code macro
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index f6c0f4e..4b62b81 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -26,11 +26,11 @@
LOCAL_PATH := $(call my-dir)
# Import the following variables:
-# MESA_CXX_SOURCES
-# MESA_GALLIUM_CXX_SOURCES
-# MESA_GALLIUM_SOURCES
-# MESA_SOURCES
-# X86_SOURCES
+# MESA_CXX_FILES
+# MESA_GALLIUM_CXX_FILES
+# MESA_GALLIUM_FILES
+# MESA_FILES
+# X86_FILES
include $(LOCAL_PATH)/sources.mak
common_CFLAGS := \
@@ -49,7 +49,7 @@ common_ASM :=
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
-common_ASM += $(X86_SOURCES)
+common_ASM += $(X86_FILES)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := x86/gen_matypes.c
@@ -71,8 +71,8 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(MESA_GALLIUM_SOURCES) \
- $(MESA_GALLIUM_CXX_SOURCES) \
+ $(MESA_GALLIUM_FILES) \
+ $(MESA_GALLIUM_CXX_FILES) \
$(common_ASM)
LOCAL_CFLAGS := $(common_CFLAGS)
@@ -108,8 +108,8 @@ LOCAL_C_INCLUDES := \
$(common_C_INCLUDES)
LOCAL_SRC_FILES := \
- $(MESA_SOURCES) \
- $(MESA_CXX_SOURCES) \
+ $(MESA_FILES) \
+ $(MESA_CXX_FILES) \
$(common_ASM)
include $(LOCAL_PATH)/Android.gen.mk
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4783f32..3906053 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -149,13 +149,13 @@ asm_subdirs:
######################################################################
# Dependency generation
-depend: $(ALL_SOURCES)
+depend: $(ALL_FILES)
@ echo "running $(MKDEP)"
@ touch depend
@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
- $(ALL_SOURCES) > /dev/null 2>/dev/null
+ $(ALL_FILES) > /dev/null 2>/dev/null
@$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \
- $(ALL_SOURCES) > /dev/null 2>/dev/null
+ $(ALL_FILES) > /dev/null 2>/dev/null
######################################################################
# Installation rules
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 19a05ec..7b19bbc 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -1,11 +1,11 @@
### Lists of source files, included by Makefiles
-# this is part of MAIN_SOURCES
-MAIN_ES_SOURCES = \
+# this is part of MAIN_FILES
+MAIN_ES_FILES = \
main/api_exec_es1.c \
main/api_exec_es2.c
-MAIN_SOURCES = \
+MAIN_FILES = \
main/api_arrayelt.c \
main/api_exec.c \
main/api_loopback.c \
@@ -103,14 +103,14 @@ MAIN_SOURCES = \
main/version.c \
main/viewport.c \
main/vtxfmt.c \
- $(MAIN_ES_SOURCES)
+ $(MAIN_ES_FILES)
-MAIN_CXX_SOURCES = \
+MAIN_CXX_FILES = \
main/ff_fragment_shader.cpp \
main/shader_query.cpp \
main/uniform_query.cpp
-MATH_SOURCES = \
+MATH_FILES = \
math/m_debug_clip.c \
math/m_debug_norm.c \
math/m_debug_xform.c \
@@ -119,10 +119,10 @@ MATH_SOURCES = \
math/m_translate.c \
math/m_vector.c
-MATH_XFORM_SOURCES = \
+MATH_XFORM_FILES = \
math/m_xform.c
-SWRAST_SOURCES = \
+SWRAST_FILES = \
swrast/s_aaline.c \
swrast/s_aatriangle.c \
swrast/s_alpha.c \
@@ -153,11 +153,11 @@ SWRAST_SOURCES = \
swrast/s_triangle.c \
swrast/s_zoom.c
-SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_FILES = \
swrast_setup/ss_context.c \
swrast_setup/ss_triangle.c
-TNL_SOURCES = \
+TNL_FILES = \
tnl/t_context.c \
tnl/t_pipeline.c \
tnl/t_draw.c \
@@ -176,7 +176,7 @@ TNL_SOURCES = \
tnl/t_vertex_sse.c \
tnl/t_vertex_generic.c
-VBO_SOURCES = \
+VBO_FILES = \
vbo/vbo_context.c \
vbo/vbo_exec.c \
vbo/vbo_exec_api.c \
@@ -194,7 +194,7 @@ VBO_SOURCES = \
vbo/vbo_save_draw.c \
vbo/vbo_save_loopback.c
-STATETRACKER_SOURCES = \
+STATETRACKER_FILES = \
state_tracker/st_atom.c \
state_tracker/st_atom_blend.c \
state_tracker/st_atom_clip.c \
@@ -243,7 +243,7 @@ STATETRACKER_SOURCES = \
state_tracker/st_program.c \
state_tracker/st_texture.c
-PROGRAM_SOURCES = \
+PROGRAM_FILES = \
program/arbprogparse.c \
program/hash_table.c \
program/lex.yy.c \
@@ -267,12 +267,12 @@ PROGRAM_SOURCES = \
program/symbol_table.c
-SHADER_CXX_SOURCES = \
+SHADER_CXX_FILES = \
program/ir_to_mesa.cpp \
program/sampler.cpp \
program/string_to_uint_map.cpp
-ASM_C_SOURCES = \
+ASM_C_FILES = \
x86/common_x86.c \
x86/x86_xform.c \
x86/3dnow.c \
@@ -281,7 +281,7 @@ ASM_C_SOURCES = \
sparc/sparc.c \
x86-64/x86-64.c
-X86_SOURCES = \
+X86_FILES = \
x86/common_x86_asm.S \
x86/x86_xform2.S \
x86/x86_xform3.S \
@@ -300,71 +300,71 @@ X86_SOURCES = \
x86/sse_normal.S \
x86/read_rgba_span_x86.S
-X86-64_SOURCES = \
+X86_64_FILES = \
x86-64/xform4.S
-SPARC_SOURCES = \
+SPARC_FILES = \
sparc/clip.S \
sparc/norm.S \
sparc/xform.S
-COMMON_DRIVER_SOURCES = \
+COMMON_DRIVER_FILES = \
drivers/common/driverfuncs.c \
drivers/common/meta.c
# Sources for building non-Gallium drivers
-MESA_SOURCES = \
- $(MAIN_SOURCES) \
- $(MATH_SOURCES) \
- $(MATH_XFORM_SOURCES) \
- $(VBO_SOURCES) \
- $(TNL_SOURCES) \
- $(PROGRAM_SOURCES) \
- $(SWRAST_SOURCES) \
- $(SWRAST_SETUP_SOURCES) \
- $(COMMON_DRIVER_SOURCES)\
- $(ASM_C_SOURCES)
-
-MESA_CXX_SOURCES = \
- $(MAIN_CXX_SOURCES) \
- $(SHADER_CXX_SOURCES)
+MESA_FILES = \
+ $(MAIN_FILES) \
+ $(MATH_FILES) \
+ $(MATH_XFORM_FILES) \
+ $(VBO_FILES) \
+ $(TNL_FILES) \
+ $(PROGRAM_FILES) \
+ $(SWRAST_FILES) \
+ $(SWRAST_SETUP_FILES) \
+ $(COMMON_DRIVER_FILES)\
+ $(ASM_C_FILES)
+
+MESA_CXX_FILES = \
+ $(MAIN_CXX_FILES) \
+ $(SHADER_CXX_FILES)
# Sources for building Gallium drivers
-MESA_GALLIUM_SOURCES = \
- $(MAIN_SOURCES) \
- $(MATH_SOURCES) \
- $(VBO_SOURCES) \
- $(STATETRACKER_SOURCES) \
- $(PROGRAM_SOURCES) \
+MESA_GALLIUM_FILES = \
+ $(MAIN_FILES) \
+ $(MATH_FILES) \
+ $(VBO_FILES) \
+ $(STATETRACKER_FILES) \
+ $(PROGRAM_FILES) \
x86/common_x86.c
-MESA_GALLIUM_CXX_SOURCES = \
- $(MESA_CXX_SOURCES) \
+MESA_GALLIUM_CXX_FILES = \
+ $(MESA_CXX_FILES) \
state_tracker/st_glsl_to_tgsi.cpp
# All the core C sources, for dependency checking
-ALL_SOURCES = \
- $(MESA_SOURCES) \
- $(MESA_GALLIUM_CXX_SOURCES) \
- $(MESA_ASM_SOURCES) \
- $(STATETRACKER_SOURCES)
+ALL_FILES = \
+ $(MESA_FILES) \
+ $(MESA_GALLIUM_CXX_FILES) \
+ $(MESA_ASM_FILES) \
+ $(STATETRACKER_FILES)
### Object files
MESA_OBJECTS = \
- $(MESA_SOURCES:.c=.o) \
- $(MESA_CXX_SOURCES:.cpp=.o) \
- $(MESA_ASM_SOURCES:.S=.o)
+ $(MESA_FILES:.c=.o) \
+ $(MESA_CXX_FILES:.cpp=.o) \
+ $(MESA_ASM_FILES:.S=.o)
MESA_GALLIUM_OBJECTS = \
- $(MESA_GALLIUM_SOURCES:.c=.o) \
- $(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
- $(MESA_ASM_SOURCES:.S=.o)
+ $(MESA_GALLIUM_FILES:.c=.o) \
+ $(MESA_GALLIUM_CXX_FILES:.cpp=.o) \
+ $(MESA_ASM_FILES:.S=.o)
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
+COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_FILES:.c=.o)
### Other archives/libraries
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
