amd: automake: android: rename sources lists to foo_FILES

Autotools goes smart on us warning that foo_SOURCES variable is present
yet a target with name foo is missing. Rename things (like we do
throughout the build) to silence the warnings.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 49f8943900c79f5f729f59aa412a34bc88a87eae..df65c24d50ce27b3b122c9a855476bd75a8fb8af 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -28,7 +28,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_amd_common
 
 
 LOCAL_MODULE := libmesa_amd_common
 

-LOCAL_SRC_FILES := $(AMD_COMPILER_SOURCES)
+LOCAL_SRC_FILES := $(AMD_COMPILER_FILES)

 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include \

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 7cda4fa8274423873076c4090eb5da92d8b94a55..1a36e48101c8bdee6f517d3a74210f81ce3bbe2f 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -52,12 +52,12 @@ common_libamd_common_la_CXXFLAGS = \
 
 noinst_LTLIBRARIES += $(COMMON_LIBS)
 
 
 noinst_LTLIBRARIES += $(COMMON_LIBS)
 

-common_libamd_common_la_SOURCES = $(AMD_COMPILER_SOURCES)
+common_libamd_common_la_SOURCES = $(AMD_COMPILER_FILES)

 
 # nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
 # radv is built.
 if HAVE_RADEON_VULKAN
 
 # nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
 # radv is built.
 if HAVE_RADEON_VULKAN

-common_libamd_common_la_SOURCES += $(AMD_NIR_SOURCES)
+common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)

 endif
 
 endif
 endif
 
 endif

diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources
index 5cbefa3d2598890323ec5bb629ae7c4d96b37c5a..122ef71c452c58bba987ce9eaa1614e52d7b7a43 100644 (file)
--- a/src/amd/Makefile.sources
+++ b/src/amd/Makefile.sources
@@ -26,13 +26,13 @@ ADDRLIB_FILES = \
        addrlib/r800/siaddrlib.cpp \
        addrlib/r800/siaddrlib.h
 
        addrlib/r800/siaddrlib.cpp \
        addrlib/r800/siaddrlib.h
 

-AMD_COMPILER_SOURCES = \
+AMD_COMPILER_FILES = \

        common/ac_binary.c \
        common/ac_binary.h \
        common/ac_llvm_helper.cpp \
        common/ac_llvm_util.c \
        common/ac_llvm_util.h
 
        common/ac_binary.c \
        common/ac_binary.h \
        common/ac_llvm_helper.cpp \
        common/ac_llvm_util.c \
        common/ac_llvm_util.h
 

-AMD_NIR_SOURCES = \
+AMD_NIR_FILES = \

        common/ac_nir_to_llvm.c \
        common/ac_nir_to_llvm.h
        common/ac_nir_to_llvm.c \
        common/ac_nir_to_llvm.h