[src/trunk]: src/sys/external/bsd/drm2/drm Reorder header files to avoid drm_...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0bda1587dd1
branches:  trunk
changeset: 992454:f0bda1587dd1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:37:41 2018 +0000

description:
Reorder header files to avoid drm_legacy.h lossage.

diffstat:

 sys/external/bsd/drm2/drm/files.drmkms |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 7a97ae13553a -r f0bda1587dd1 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Mon Aug 27 06:37:29 2018 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Mon Aug 27 06:37:41 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.20 2018/08/27 06:33:08 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.21 2018/08/27 06:37:41 riastradh Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -13,11 +13,16 @@
 defflag                opt_drmkms.h    DRMKMS_DEBUG
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/include"
 makeoptions    drmkms_ttm      CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
-makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist"
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/common/include"
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
-makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/common/include"
+
+# Must come last because some header file names are repeated in
+# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
+# explicitly write <uapi/...>.  (Maybe that should have been imported
+# under dist/include/uapi rather than dist/uapi.)
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist"
 
 makeoptions    drmkms  "CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
 makeoptions    drmkms  "CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"