summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debugger/Makefile.am3
-rw-r--r--lib/tests/Makefile.am6
-rw-r--r--overlay/Makefile.am2
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/null_state_gen/Makefile.am2
5 files changed, 9 insertions, 6 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/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 3482dd44..fb433d69 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -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)
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
diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am
index 2577dd88..d1dc83ab 100644
--- a/tools/null_state_gen/Makefile.am
+++ b/tools/null_state_gen/Makefile.am
@@ -1,5 +1,5 @@
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