From: Chad Versace Date: Wed, 7 Nov 2012 22:22:54 +0000 (-0800) Subject: android: Moves rules for libmesa_glsl_utils to separate makefile X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2b638a997e384a04716cea83162cb2fa331669e;p=mesa.git android: Moves rules for libmesa_glsl_utils to separate makefile The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too long and complex to be easily understood. This patch belongs to a series that decomposes them into several easily digestible makefiles. This patch move the rules for the host and target libmesa_glsl_utils.a from Android.mk to Android.libmesa_glsl_utils.mk. Signed-off-by: Chad Versace --- diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk new file mode 100644 index 00000000000..4802757955f --- /dev/null +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -0,0 +1,59 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +# +# The libmesa_glsl_utils libraries allow us to avoid a circular dependency +# between core mesa and glsl. +# + +# --------------------------------------- +# libmesa_glsl_utils.a for target +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_glsl_utils + +LOCAL_SRC_FILES := \ + program/hash_table.c \ + program/symbol_table.c + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# libmesa_glsl_utils.a for host +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_glsl_utils +LOCAL_IS_HOST_MODULE := true + +LOCAL_SRC_FILES := \ + program/hash_table.c \ + program/symbol_table.c + +include $(MESA_COMMON_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index 552378142c4..dad2b9a6cf1 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -113,35 +113,4 @@ include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_CLASSIC -# --------------------------------------- -# Build libmesa_glsl_utils -# -# It is used to avoid circular dependency between core mesa and glsl. -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - program/hash_table.c \ - program/symbol_table.c - -LOCAL_MODULE := libmesa_glsl_utils - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_glsl_utils for host -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - program/hash_table.c \ - program/symbol_table.c - -LOCAL_MODULE := libmesa_glsl_utils -LOCAL_IS_HOST_MODULE := true - -include $(MESA_COMMON_MK) -include $(BUILD_HOST_STATIC_LIBRARY) +include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk