diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i915/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 7 |
4 files changed, 3 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index 02052f8d6f8..277d59ba4bb 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -29,7 +29,7 @@ LOCAL_MODULE := i915_dri LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) -# Import variables i915_*. +# Import variables i915_FILES. include $(LOCAL_PATH)/Makefile.sources LOCAL_CFLAGS := \ @@ -37,7 +37,6 @@ LOCAL_CFLAGS := \ -DI915 LOCAL_C_INCLUDES := \ - $(addprefix $(MESA_TOP)/,$(i915_INCLUDES)) \ $(MESA_DRI_C_INCLUDES) LOCAL_SRC_FILES := \ diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources index 243da9b44c1..455ccde28ba 100644 --- a/src/mesa/drivers/dri/i915/Makefile.sources +++ b/src/mesa/drivers/dri/i915/Makefile.sources @@ -1,7 +1,3 @@ -# Paths are relative to TOP. -i915_INCLUDES = \ - src/mesa/drivers/dri/intel - i915_FILES = \ i830_context.c \ i830_state.c \ diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 7575882fa47..d592cca3718 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -29,7 +29,7 @@ LOCAL_MODULE := i965_dri LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) -# Import variables i965_*. +# Import variables i965_FILES. include $(LOCAL_PATH)/Makefile.sources LOCAL_CFLAGS := \ @@ -41,7 +41,6 @@ LOCAL_CFLAGS += \ endif LOCAL_C_INCLUDES := \ - $(i965_INCLUDES) \ $(MESA_DRI_C_INCLUDES) LOCAL_SRC_FILES := \ diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index ca0d7cb76f4..3fb647b112e 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -1,7 +1,3 @@ -i965_INCLUDES = \ - $(MESA_TOP)/src \ - $(MESA_TOP)/src/mesa/drivers/dri/intel - i965_FILES = \ intel_asm_annotation.c \ intel_batchbuffer.c \ @@ -159,5 +155,4 @@ i965_FILES = \ gen8_viewport_state.c \ gen8_vs_state.c \ gen8_wm_depth_stencil.c \ - gen8_ps_state.c \ - $() + gen8_ps_state.c |