summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-11-22 13:19:56 +0100
committerPetri Latvala <petri.latvala@intel.com>2017-11-22 14:49:16 +0200
commitf9dff9b5ae511cd0616a65144b9bf7d299fd87d4 (patch)
tree9a57e3746bd58b36121d850ee0f2ba8a38a46950
parente1be16eeeaacd668e22d9471b2d90e8afa5df5c9 (diff)
automake: include drm-uapi headers in EXTRA_DIST
This breaks make distcheck otherwise. Cc: Eric Anholt <eric@anholt.net> Cc: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Petri Latvala <petri.latvala@intel.com> Tested-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r--Makefile.am2
-rw-r--r--benchmarks/Makefile.am3
-rw-r--r--configure.ac2
-rw-r--r--include/Makefile.am1
-rw-r--r--include/drm-uapi/Makefile.am28
5 files changed, 34 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index eb5edb7e..5bc486b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-SUBDIRS = lib man tools scripts benchmarks
+SUBDIRS = lib man tools scripts benchmarks include
if BUILD_TESTS
SUBDIRS += tests
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 4b461a02..055e4c3a 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include/drm-uapi \
-I$(top_srcdir)/lib
-AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
+AM_CFLAGS = -I$(top_srcdir)/include/drm-uapi \
+ $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
$(WERROR_CFLAGS) -D_GNU_SOURCE
LDADD = $(top_builddir)/lib/libintel_tools.la
diff --git a/configure.ac b/configure.ac
index adb59981..1ac2e8e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,6 +413,8 @@ AC_CONFIG_FILES([
tools/Makefile
tools/null_state_gen/Makefile
tools/registers/Makefile
+ include/Makefile
+ include/drm-uapi/Makefile
debugger/Makefile
debugger/system_routine/Makefile
assembler/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 00000000..17d75cd1
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = . drm-uapi
diff --git a/include/drm-uapi/Makefile.am b/include/drm-uapi/Makefile.am
new file mode 100644
index 00000000..f335251b
--- /dev/null
+++ b/include/drm-uapi/Makefile.am
@@ -0,0 +1,28 @@
+EXTRA_DIST = \
+ amdgpu_drm.h \
+ armada_drm.h \
+ drm_fourcc.h \
+ drm.h \
+ drm_mode.h \
+ drm_sarea.h \
+ etnaviv_drm.h \
+ exynos_drm.h \
+ i810_drm.h \
+ i915_drm.h \
+ Makefile.am \
+ mga_drm.h \
+ msm_drm.h \
+ nouveau_drm.h \
+ omap_drm.h \
+ qxl_drm.h \
+ r128_drm.h \
+ radeon_drm.h \
+ savage_drm.h \
+ sis_drm.h \
+ tegra_drm.h \
+ vc4_drm.h \
+ vgem_drm.h \
+ via_drm.h \
+ virtgpu_drm.h \
+ vmwgfx_drm.h \
+ $(NULL)