diff options
| author | Eric Anholt <eric@anholt.net> | 2017-11-10 12:35:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-11-21 09:52:50 -0800 |
| commit | 4eb53c7cc02a36a23c33f786cb20bf078719f40e (patch) | |
| tree | 55105a593764d25196ff39c653a603b2713dd24d | |
| parent | 1c0582866fb459c829538e4a7a7fcf177fc56aa7 (diff) | |
tests: Convert to using the imported drm-uapi headers.
Tested by dropping garbage in my libdrm's headers and rebuilding.
v2: Pull in DRM_CFLAGS movement that ended up later in the sequence.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | lib/Makefile.am | 5 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 30ddb92b..7b3d8778 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -46,7 +46,10 @@ lib_source_list += \ $(NULL) endif -AM_CPPFLAGS = -I$(top_srcdir) +AM_CPPFLAGS = \ + -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir) + AM_CFLAGS = \ $(CWARNFLAGS) \ $(DRM_CFLAGS) \ diff --git a/meson.build b/meson.build index fb81c4db..b14617a5 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ foreach cc_arg : cc_args endif endforeach -inc = include_directories('lib', '.') +inc = include_directories('include/drm-uapi', 'lib', '.') config = configuration_data() diff --git a/tests/Makefile.am b/tests/Makefile.am index db360523..3cf5af3a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -84,14 +84,15 @@ EXTRA_DIST = \ CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore -AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ +AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ + -I$(top_srcdir)/include/drm-uapi \ -I$(srcdir)/.. \ -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ -DIGT_SRCDIR=\""$(abs_srcdir)"\" \ -DIGT_DATADIR=\""$(pkgdatadir)"\" \ -D_GNU_SOURCE \ - $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ + $(DRM_CFLAGS) $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ $(NULL) LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS) |