diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-16 09:09:18 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-05-29 12:39:42 -0700 |
| commit | 7d7fe1b0376d5017c21351c0df8168b733801570 (patch) | |
| tree | 623d5864af552ef5a8831ecf73267bb5257e02b4 /src/mesa/Android.mk | |
| parent | b284d4773b889d042a4ea086a28a7ea18de98f28 (diff) | |
| download | external_mesa3d-7d7fe1b0376d5017c21351c0df8168b733801570.zip external_mesa3d-7d7fe1b0376d5017c21351c0df8168b733801570.tar.gz external_mesa3d-7d7fe1b0376d5017c21351c0df8168b733801570.tar.bz2 | |
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 <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/Android.mk')
| -rw-r--r-- | src/mesa/Android.mk | 20 |
1 files changed, 10 insertions, 10 deletions
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 |