From cd18bbeef342152cd1a09e2703790bd48002a6ca Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 27 Aug 2016 17:19:34 +0200 Subject: [PATCH] android: intel: Flatten the makefile structure Android porting of commit bebc1a1 "intel: Flatten the makefile structure" Automake approach was followed, by moving makefiles a level up, naming them Android.genxml.mk and Android.isl.mk, performing the necessary adjustments to the paths, adding src/intel/Android.mk and fixing mesa top level makefile. Acked-by: Jason Ekstrand --- Android.mk | 3 +- .../{genxml/Android.mk => Android.genxml.mk} | 58 +++++++++---------- src/intel/{isl/Android.mk => Android.isl.mk} | 33 +++++------ src/intel/Android.mk | 29 ++++++++++ 4 files changed, 75 insertions(+), 48 deletions(-) rename src/intel/{genxml/Android.mk => Android.genxml.mk} (66%) rename src/intel/{isl/Android.mk => Android.isl.mk} (87%) create mode 100644 src/intel/Android.mk diff --git a/Android.mk b/Android.mk index a83cb338d18..dfc45c42638 100644 --- a/Android.mk +++ b/Android.mk @@ -95,8 +95,7 @@ SUBDIRS := \ src/mesa \ src/util \ src/egl \ - src/intel/genxml \ - src/intel/isl \ + src/intel \ src/mesa/drivers/dri INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) diff --git a/src/intel/genxml/Android.mk b/src/intel/Android.genxml.mk similarity index 66% rename from src/intel/genxml/Android.mk rename to src/intel/Android.genxml.mk index 39b5e2cb356..79de7843801 100644 --- a/src/intel/genxml/Android.mk +++ b/src/intel/Android.genxml.mk @@ -18,11 +18,11 @@ # 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) - -# Import variable GENERATED_FILES. -include $(LOCAL_PATH)/Makefile.sources +# --------------------------------------- +# Build libmesa_genxml +# --------------------------------------- include $(CLEAR_VARS) @@ -41,7 +41,7 @@ $(intermediates)/dummy.c: $(hide) touch $@ # This is the list of auto-generated files headers -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/genxml/, $(GENXML_GENERATED_FILES)) +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(GENXML_GENERATED_FILES)) define header-gen @mkdir -p $(dir $@) @@ -49,44 +49,44 @@ define header-gen $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_XML) > $@ endef -$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen4_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen4.xml -$(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/gen4.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen4_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen4.xml +$(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/genxml/gen4.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen45_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen45.xml -$(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/gen45.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen45_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen45.xml +$(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/genxml/gen45.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen5_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen5.xml -$(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/gen5.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen5_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen5.xml +$(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/genxml/gen5.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen6.xml -$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/gen6.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen6.xml +$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/genxml/gen6.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen7.xml -$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/gen7.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen7.xml +$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/genxml/gen7.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen75.xml -$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/gen75.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen75.xml +$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/genxml/gen75.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen8.xml -$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/gen8.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen8.xml +$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/genxml/gen8.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py -$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen9.xml -$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/gen9.xml $(LOCAL_PATH)/gen_pack_header.py +$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen9.xml +$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) LOCAL_EXPORT_C_INCLUDE_DIRS := \ diff --git a/src/intel/isl/Android.mk b/src/intel/Android.isl.mk similarity index 87% rename from src/intel/isl/Android.mk rename to src/intel/Android.isl.mk index e2771ad320f..7e578af170e 100644 --- a/src/intel/isl/Android.mk +++ b/src/intel/Android.isl.mk @@ -20,17 +20,16 @@ # DEALINGS IN THE SOFTWARE. # -LOCAL_PATH := $(call my-dir) - -# Import variables LIBISL_FILES. -include $(LOCAL_PATH)/Makefile.sources +# --------------------------------------- +# libmesa_isl_gen* common variables +# --------------------------------------- LIBISL_GENX_COMMON_INCLUDES := \ $(MESA_TOP)/src/ \ $(MESA_TOP)/src/mesa/drivers/dri/i965 # --------------------------------------- -# Build libisl_gen4 +# Build libmesa_isl_gen4 # --------------------------------------- include $(CLEAR_VARS) @@ -49,7 +48,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen5 +# Build libmesa_isl_gen5 # --------------------------------------- include $(CLEAR_VARS) @@ -68,7 +67,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen6 +# Build libmesa_isl_gen6 # --------------------------------------- include $(CLEAR_VARS) @@ -87,7 +86,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen7 +# Build libmesa_isl_gen7 # --------------------------------------- include $(CLEAR_VARS) @@ -106,7 +105,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen75 +# Build libmesa_isl_gen75 # --------------------------------------- include $(CLEAR_VARS) @@ -125,7 +124,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen8 +# Build libmesa_isl_gen8 # --------------------------------------- include $(CLEAR_VARS) @@ -144,7 +143,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl_gen9 +# Build libmesa_isl_gen9 # --------------------------------------- include $(CLEAR_VARS) @@ -163,7 +162,7 @@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # --------------------------------------- -# Build libisl +# Build libmesa_isl # --------------------------------------- include $(CLEAR_VARS) @@ -205,12 +204,12 @@ define bash-gen endef isl_format_layout_deps := \ - $(LOCAL_PATH)/gen_format_layout.py \ - $(LOCAL_PATH)/isl_format_layout.csv + $(LOCAL_PATH)/isl/gen_format_layout.py \ + $(LOCAL_PATH)/isl/isl_format_layout.csv -$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_format_layout.py -$(intermediates)/isl_format_layout.c: PRIVATE_CSV := $(LOCAL_PATH)/isl_format_layout.csv -$(intermediates)/isl_format_layout.c: $(isl_format_layout_deps) +$(intermediates)/isl/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/isl/gen_format_layout.py +$(intermediates)/isl/isl_format_layout.c: PRIVATE_CSV := $(LOCAL_PATH)/isl/isl_format_layout.csv +$(intermediates)/isl/isl_format_layout.c: $(isl_format_layout_deps) $(call bash-gen) include $(MESA_COMMON_MK) diff --git a/src/intel/Android.mk b/src/intel/Android.mk new file mode 100644 index 00000000000..114b111eba9 --- /dev/null +++ b/src/intel/Android.mk @@ -0,0 +1,29 @@ +# Copyright © 2016 Intel Corporation +# Copyright © 2016 Mauro Rossi +# +# 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) + +# Import variables +include $(LOCAL_PATH)/Makefile.sources + +include $(LOCAL_PATH)/Android.genxml.mk +include $(LOCAL_PATH)/Android.isl.mk -- 2.30.2