Commit efef51dd authored by Lionel Landwerlin's avatar Lionel Landwerlin

debugger/overlay/tools: make sure to include embedded drm-uapi headers

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)

v3: More fixes in lib/tests (Lionel)
Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent 39ac6b89
......@@ -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) \
......
......@@ -7,13 +7,15 @@ AM_TESTS_ENVIRONMENT = \
top_builddir=$(top_builddir) \
top_srcdir=$(top_srcdir)
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS) \
AM_CPPFLAGS = \
-I$(top_srcdir)/include/drm-uapi \
-I$(srcdir)/../.. \
-I$(srcdir)/.. \
-include "$(srcdir)/../../lib/check-ndebug.h" \
-DIGT_DATADIR=\""$(abs_srcdir)"\" \
-D_GNU_SOURCE
$(NULL)
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)
LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS) $(TIMER_LIBS)
......
......@@ -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
......
......@@ -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
......
GPU_TOOLS_PATH := $(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi
AM_CFLAGS = $(DEBUG_CFLAGS) $(CWARNFLAGS)
noinst_PROGRAMS = intel_null_state_gen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment