OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: rename Makefile.sources' _SOURCES variables

Browse Source 
automake uses variables named *_SOURCES.

Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Matt Turner
2012-01-28 20:13:51 -05:00
parent 275ac7e5c1
commit 4ff8fd93e8
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/glsl/Android.mk
View File

@@ -34,9 +34,9 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBGLCPP_SOURCES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_SOURCES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_SOURCES) $(LIBGLSL_CXX_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
@@ -55,11 +55,11 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBGLCPP_SOURCES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_SOURCES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_SOURCES) \ $(LIBGLSL_CXX_FILES) \
$(BUILTIN_COMPILER_CXX_SOURCES) \ $(BUILTIN_COMPILER_CXX_FILES) \
$(GLSL_COMPILER_CXX_SOURCES) $(GLSL_COMPILER_CXX_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
@@ -82,7 +82,7 @@ include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(GLSL_COMPILER_CXX_SOURCES) $(GLSL_COMPILER_CXX_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \

16
src/glsl/Makefile
View File

@@ -10,20 +10,20 @@ LIBNAME = glsl
include Makefile.sources include Makefile.sources
GLCPP_SOURCES = \ GLCPP_SOURCES = \
$(LIBGLCPP_GENERATED_SOURCES) \ $(LIBGLCPP_GENERATED_FILES) \
$(LIBGLCPP_SOURCES) \ $(LIBGLCPP_FILES) \
ralloc.c \ ralloc.c \
glcpp/glcpp.c glcpp/glcpp.c
C_SOURCES = \ C_SOURCES = \
$(LIBGLCPP_GENERATED_SOURCES) \ $(LIBGLCPP_GENERATED_FILES) \
$(LIBGLCPP_SOURCES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_SOURCES) $(LIBGLSL_FILES)
# common sources for builtin_compiler and libglsl # common sources for builtin_compiler and libglsl
CXX_SOURCES = \ CXX_SOURCES = \
$(BUILTIN_COMPILER_GENERATED_CXX_SOURCES) \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
$(LIBGLSL_CXX_SOURCES) $(LIBGLSL_CXX_FILES)
LIBS = \ LIBS = \
$(TOP)/src/glsl/libglsl.a $(TOP)/src/glsl/libglsl.a
@@ -34,7 +34,7 @@ GLSL2_C_SOURCES = \
../mesa/program/hash_table.c \ ../mesa/program/hash_table.c \
../mesa/program/symbol_table.c ../mesa/program/symbol_table.c
GLSL2_CXX_SOURCES = \ GLSL2_CXX_SOURCES = \
$(GLSL_COMPILER_CXX_SOURCES) $(GLSL_COMPILER_CXX_FILES)
GLSL2_OBJECTS = \ GLSL2_OBJECTS = \
$(GLSL2_C_SOURCES:.c=.o) \ $(GLSL2_C_SOURCES:.c=.o) \

18
src/glsl/Makefile.sources
View File

@@ -2,20 +2,20 @@
# libglcpp # libglcpp
LIBGLCPP_SOURCES := \ LIBGLCPP_FILES := \
glcpp/pp.c glcpp/pp.c
LIBGLCPP_GENERATED_SOURCES := \ LIBGLCPP_GENERATED_FILES := \
glcpp/glcpp-lex.c \ glcpp/glcpp-lex.c \
glcpp/glcpp-parse.c glcpp/glcpp-parse.c
# libglsl # libglsl
LIBGLSL_SOURCES := \ LIBGLSL_FILES := \
strtod.c \ strtod.c \
ralloc.c ralloc.c
LIBGLSL_CXX_SOURCES := \ LIBGLSL_CXX_FILES := \
ast_expr.cpp \ ast_expr.cpp \
ast_function.cpp \ ast_function.cpp \
ast_to_hir.cpp \ ast_to_hir.cpp \
@@ -82,7 +82,7 @@ LIBGLSL_CXX_SOURCES := \
# glsl_compiler # glsl_compiler
GLSL_COMPILER_CXX_SOURCES := \ GLSL_COMPILER_CXX_FILES := \
standalone_scaffolding.cpp \ standalone_scaffolding.cpp \
main.cpp main.cpp
@@ -92,14 +92,14 @@ GLSL_COMPILER_CXX_SOURCES := \
# For this to work, a dummy version of builtin_function.cpp, # For this to work, a dummy version of builtin_function.cpp,
# builtin_stubs.cpp, is used. # builtin_stubs.cpp, is used.
BUILTIN_COMPILER_CXX_SOURCES := \ BUILTIN_COMPILER_CXX_FILES := \
builtin_stubs.cpp builtin_stubs.cpp
BUILTIN_COMPILER_GENERATED_CXX_SOURCES := \ BUILTIN_COMPILER_GENERATED_CXX_FILES := \
glsl_lexer.cpp \ glsl_lexer.cpp \
glsl_parser.cpp glsl_parser.cpp
# libglsl generated sources # libglsl generated sources
LIBGLSL_GENERATED_CXX_SOURCES := \ LIBGLSL_GENERATED_CXX_FILES := \
$(BUILTIN_COMPILER_GENERATED_CXX_SOURCES) \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
builtin_function.cpp builtin_function.cpp

6
src/glsl/SConscript
View File

@@ -42,7 +42,7 @@ glsl_sources = [
source_lists = env.ParseSourceList('Makefile.sources') source_lists = env.ParseSourceList('Makefile.sources')
# add non-generated sources # add non-generated sources
for l in ('LIBGLCPP_SOURCES', 'LIBGLSL_SOURCES', 'LIBGLSL_CXX_SOURCES'): for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'):
glsl_sources += source_lists[l] glsl_sources += source_lists[l]
if env['msvc']: if env['msvc']:
@@ -57,7 +57,7 @@ else:
env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE')) env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE'))
env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_SOURCES']) compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
mesa_objs = env.StaticObject([ mesa_objs = env.StaticObject([
'hash_table.c', 'hash_table.c',
@@ -69,7 +69,7 @@ else:
builtin_compiler = env.Program( builtin_compiler = env.Program(
target = 'builtin_compiler', target = 'builtin_compiler',
source = compiler_objs + glsl_sources + \ source = compiler_objs + glsl_sources + \
source_lists['BUILTIN_COMPILER_CXX_SOURCES'], source_lists['BUILTIN_COMPILER_CXX_FILES'],
) )
# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll