Headers from lib/ depend on drm uapi headers. Since we started embedding them, let's make sure to pull them first. We still depend on libdrm in places, we don't want the system headers from libdrm to be included prior to the embedded ones. v2: Fix debugger/overlay (Lionel) Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@xxxxxxxxx> --- debugger/Makefile.am | 3 ++- overlay/Makefile.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debugger/Makefile.am b/debugger/Makefile.am index 9d231d3f..ceaab6f8 100644 --- a/debugger/Makefile.am +++ b/debugger/Makefile.am @@ -6,7 +6,8 @@ noinst_PROGRAMS = debug_rdata AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include/drm-uapi AM_CFLAGS = \ $(DRM_CFLAGS) \ diff --git a/overlay/Makefile.am b/overlay/Makefile.am index f49f54ac..fca04cae 100644 --- a/overlay/Makefile.am +++ b/overlay/Makefile.am @@ -2,7 +2,7 @@ if BUILD_OVERLAY bin_PROGRAMS = intel-gpu-overlay endif -AM_CPPFLAGS = -I. +AM_CPPFLAGS = -I. -I$(top_srcdir)/include/drm-uapi AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CFLAGS) -I$(srcdir)/../lib LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS) $(top_builddir)/lib/libigt_perf.la diff --git a/tools/Makefile.am b/tools/Makefile.am index a8196f07..dcf282ea 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,7 +15,7 @@ endif SUBDIRS = null_state_gen registers -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi -I$(top_srcdir)/lib AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DIGT_DATADIR=\"$(pkgdatadir)\" \ $(WERROR_CFLAGS) -D_GNU_SOURCE -- 2.15.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
