Android.mk files were referring to LOCAL_PATH instead of path where wanted Makefile.sources was existing. Also minor cleanups.
Signed-off-by: Tapani Pälli <[email protected]> --- src/intel/Makefile.sources | 62 ++++++++++++++++++++++----------------------- src/intel/genxml/Android.mk | 4 +-- src/intel/isl/Android.mk | 5 ++-- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index a8ba0b9..477cc5d 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -1,50 +1,50 @@ GENXML_GENERATED_FILES = \ - genxml/gen4_pack.h \ - genxml/gen45_pack.h \ - genxml/gen5_pack.h \ - genxml/gen6_pack.h \ - genxml/gen7_pack.h \ - genxml/gen75_pack.h \ - genxml/gen8_pack.h \ - genxml/gen9_pack.h + gen4_pack.h \ + gen45_pack.h \ + gen5_pack.h \ + gen6_pack.h \ + gen7_pack.h \ + gen75_pack.h \ + gen8_pack.h \ + gen9_pack.h ISL_FILES = \ - isl/isl.c \ - isl/isl.h \ - isl/isl_format.c \ - isl/isl_priv.h \ - isl/isl_storage_image.c + isl.c \ + isl.h \ + isl_format.c \ + isl_priv.h \ + isl_storage_image.c ISL_GEN4_FILES = \ - isl/isl_gen4.c \ - isl/isl_gen4.h \ - isl/isl_surface_state.c + isl_gen4.c \ + isl_gen4.h \ + isl_surface_state.c ISL_GEN5_FILES = \ - isl/isl_surface_state.c + isl_surface_state.c ISL_GEN6_FILES = \ - isl/isl_gen6.c \ - isl/isl_gen6.h \ - isl/isl_surface_state.c + isl_gen6.c \ + isl_gen6.h \ + isl_surface_state.c ISL_GEN7_FILES = \ - isl/isl_gen7.c \ - isl/isl_gen7.h \ - isl/isl_surface_state.c + isl_gen7.c \ + isl_gen7.h \ + isl_surface_state.c ISL_GEN75_FILES = \ - isl/isl_surface_state.c + isl_surface_state.c ISL_GEN8_FILES = \ - isl/isl_gen8.c \ - isl/isl_gen8.h \ - isl/isl_surface_state.c + isl_gen8.c \ + isl_gen8.h \ + isl_surface_state.c ISL_GEN9_FILES = \ - isl/isl_gen9.c \ - isl/isl_gen9.h \ - isl/isl_surface_state.c + isl_gen9.c \ + isl_gen9.h \ + isl_surface_state.c ISL_GENERATED_FILES = \ - isl/isl_format_layout.c + isl_format_layout.c diff --git a/src/intel/genxml/Android.mk b/src/intel/genxml/Android.mk index 39b5e2c..d45090f 100644 --- a/src/intel/genxml/Android.mk +++ b/src/intel/genxml/Android.mk @@ -21,8 +21,8 @@ LOCAL_PATH := $(call my-dir) -# Import variable GENERATED_FILES. -include $(LOCAL_PATH)/Makefile.sources +# Import variable GENXML_GENERATED_FILES. +include $(LOCAL_PATH)/../Makefile.sources include $(CLEAR_VARS) diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk index e2771ad..3a0e8fe 100644 --- a/src/intel/isl/Android.mk +++ b/src/intel/isl/Android.mk @@ -22,8 +22,8 @@ LOCAL_PATH := $(call my-dir) -# Import variables LIBISL_FILES. -include $(LOCAL_PATH)/Makefile.sources +# Import variable ISL_FILES. +include $(LOCAL_PATH)/../Makefile.sources LIBISL_GENX_COMMON_INCLUDES := \ $(MESA_TOP)/src/ \ @@ -177,6 +177,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/intel \ $(MESA_TOP)/src/mesa/drivers/dri/i965 \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel -- 2.7.4 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
