diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-27 16:13:50 +0000 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-04-22 14:26:22 +0100 |
commit | 6fb801786604c270fae99c3d665dcebaa0bff3a6 (patch) | |
tree | c4dc647285c8da44069863ff3b7ee4820df4afb3 | |
parent | ba3bc1eea2f41e06a6c4300d4bc2b3547dbcaaec (diff) | |
download | external_mesa3d-6fb801786604c270fae99c3d665dcebaa0bff3a6.zip external_mesa3d-6fb801786604c270fae99c3d665dcebaa0bff3a6.tar.gz external_mesa3d-6fb801786604c270fae99c3d665dcebaa0bff3a6.tar.bz2 |
android: add $(mesa_top)/src include to the whole of mesa
Many parts of mesa already have the include with others depending on it
but it's missing. Add it once at the top makefile and be done with it.
Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
-rw-r--r-- | Android.common.mk | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/Android.mk | 3 | ||||
-rw-r--r-- | src/glsl/Android.mk | 2 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 1 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 2 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/Android.mk | 1 | ||||
-rw-r--r-- | src/mesa/program/Android.mk | 1 | ||||
-rw-r--r-- | src/util/Android.mk | 6 |
9 files changed, 4 insertions, 14 deletions
diff --git a/Android.common.mk b/Android.common.mk index e34f206..f473a4b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -31,6 +31,7 @@ endif endif LOCAL_C_INCLUDES += \ + $(MESA_TOP)/src \ $(MESA_TOP)/include MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 0bc1831..c7b2634 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -33,8 +33,7 @@ LOCAL_SRC_FILES := \ $(VL_STUB_SOURCES) LOCAL_C_INCLUDES := \ - $(GALLIUM_TOP)/auxiliary/util \ - $(MESA_TOP)/src + $(GALLIUM_TOP)/auxiliary/util LOCAL_MODULE := libmesa_gallium diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index 38c2087..2ac1ffb 100644 --- a/src/glsl/Android.mk +++ b/src/glsl/Android.mk @@ -38,7 +38,6 @@ LOCAL_SRC_FILES := \ $(LIBGLSL_FILES) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa @@ -59,7 +58,6 @@ LOCAL_SRC_FILES := \ $(GLSL_COMPILER_CXX_FILES) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index e4a5267..73afcc7 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -61,7 +61,6 @@ endif LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/gallium/auxiliary diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk index a9f6ff5..b7e64c5 100644 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -36,7 +36,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_glsl_utils LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi @@ -59,7 +58,6 @@ LOCAL_IS_HOST_MODULE := true LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index a08366d..fdf847a 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -55,7 +55,6 @@ LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index d1c836b..e168fe0 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -35,7 +35,6 @@ MESA_DRI_CFLAGS := \ -DHAVE_ANDROID_PLATFORM MESA_DRI_C_INCLUDES := \ - $(MESA_TOP)/src \ $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ external/expat/lib diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index a237b65..e85afe6 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -71,7 +71,6 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l LOCAL_C_INCLUDES := \ $(intermediates) \ - $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/glsl diff --git a/src/util/Android.mk b/src/util/Android.mk index 2eb0ef7..c2c0cb3 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -35,8 +35,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src + $(MESA_TOP)/src/mapi LOCAL_MODULE := libmesa_util @@ -69,8 +68,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src + $(MESA_TOP)/src/mapi LOCAL_MODULE := libmesa_util |