summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-11-15 19:36:33 +0000
committerEmil Velikov <[email protected]>2016-11-15 20:04:37 +0000
commit75a39cca8d046749b216046ef5651dda5c451635 (patch)
tree30b3969b7056ddba9360582b8864029a94e4229b
parent95ed2d9d2cf161ce63fe6a8b1694288634b6b65e (diff)
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 <[email protected]>
-rw-r--r--src/amd/Android.common.mk2
-rw-r--r--src/amd/Makefile.common.am4
-rw-r--r--src/amd/Makefile.sources4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 49f8943900c..df65c24d50c 100644
--- 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_SRC_FILES := $(AMD_COMPILER_SOURCES)
+LOCAL_SRC_FILES := $(AMD_COMPILER_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/include \
diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 7cda4fa8274..1a36e48101c 100644
--- 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)
-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
-common_libamd_common_la_SOURCES += $(AMD_NIR_SOURCES)
+common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
endif
endif
diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources
index 5cbefa3d259..122ef71c452 100644
--- a/src/amd/Makefile.sources
+++ b/src/amd/Makefile.sources
@@ -26,13 +26,13 @@ ADDRLIB_FILES = \
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
-AMD_NIR_SOURCES = \
+AMD_NIR_FILES = \
common/ac_nir_to_llvm.c \
common/ac_nir_to_llvm.h