diff mbox

[i-g-t,2/2] automake: include drm-uapi headers in EXTRA_DIST

Message ID 20171122121956.31409-2-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Nov. 22, 2017, 12:19 p.m. UTC 
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>
---
 Makefile.am                  |  2 +-
 benchmarks/Makefile.am       |  3 ++-
 configure.ac                 |  2 ++
 include/Makefile.am          |  1 +
 include/drm-uapi/Makefile.am | 28 ++++++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 include/Makefile.am
 create mode 100644 include/drm-uapi/Makefile.am

Comments

Eric Anholt Nov. 22, 2017, 6:21 p.m. UTC | #1 
Petri Latvala <petri.latvala@intel.com> writes:

> Series is reviewed and tested and pushed, thanks.

Thanks, sorry for the fallout!
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index eb5edb7e26f5..5bc486b976d9 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 9f2671be192b..9b7b5909391c 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 adb5998142ef..1ac2e8e8805a 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 000000000000..17d75cd1dce1
--- /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 000000000000..f335251bd568
--- /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)