diff options
| author | Eric Anholt <[email protected]> | 2017-06-28 16:35:55 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-07-12 10:58:33 -0700 |
| commit | 5d6271c6a566b71b84ce060a71494467f312b0df (patch) | |
| tree | 619094cba0f69b551e53b7e1ddb3db0c32a83a8c /src/mesa | |
| parent | 2aec62a45b1c907a8fff511b8eca21fa52538acb (diff) | |
intel: Move the DRM uapi headers to a non-Intel location.
I want to remove vc4's dependency on headers from libdrm as well, but
storing multiple copies of drm_fourcc.h in our tree would be silly.
v2: Update Android.mk as well, move distcheck drm*.h references to
top-level noinst_HEADERS.
Reviewed-by: Lionel Landwerlin <[email protected]> (v1)
Reviewed-by: Daniel Stone <[email protected]> (v1)
Reviewed-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 8996aec3b6a..d75ffb13813 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -30,7 +30,7 @@ include $(LOCAL_PATH)/Makefile.sources I965_PERGEN_COMMON_INCLUDES := \ $(MESA_DRI_C_INCLUDES) \ $(MESA_TOP)/src/intel \ - $(MESA_TOP)/src/intel/drm + $(MESA_TOP)/include/drm-uapi I965_PERGEN_SHARED_LIBRARIES := \ $(MESA_DRI_SHARED_LIBRARIES) @@ -258,7 +258,7 @@ endif LOCAL_C_INCLUDES := \ $(MESA_DRI_C_INCLUDES) \ - $(MESA_TOP)/src/intel/drm + $(MESA_TOP)/include/drm-uapi LOCAL_SRC_FILES := \ $(i965_FILES) diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 4b56b4b0efe..ecc1e766f11 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -38,7 +38,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/compiler/nir \ -I$(top_builddir)/src/intel \ -I$(top_srcdir)/src/intel \ - -I$(top_srcdir)/src/intel/drm \ + -I$(top_srcdir)/include/drm-uapi \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ $(LIBDRM_CFLAGS) \ |