From 434af38f8d19c61fdcfa611644c29dbe73f9f3a9 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 Jan 2019 14:42:14 +0100 Subject: automake: Ditch all EXTRA_DIST directives We're not using automake to build tarballs anymore. Acked-by: Petri Latvala Signed-off-by: Daniel Vetter --- Makefile.am | 7 +------ benchmarks/Makefile.am | 7 ------- benchmarks/ezbench.d/Makefile.am | 16 ---------------- benchmarks/wsim/Makefile.am | 31 ------------------------------- configure.ac | 3 --- include/Makefile.am | 1 - include/drm-uapi/Makefile.am | 29 ----------------------------- lib/Makefile.am | 6 ------ lib/tests/Makefile.am | 4 ---- overlay/Makefile.am | 5 ----- tests/Makefile.am | 6 ------ tools/Makefile.am | 4 ---- tools/null_state_gen/Makefile.am | 4 ---- 13 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 benchmarks/ezbench.d/Makefile.am delete mode 100644 benchmarks/wsim/Makefile.am delete mode 100644 include/Makefile.am delete mode 100644 include/drm-uapi/Makefile.am diff --git a/Makefile.am b/Makefile.am index 1cc98264..94250964 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = lib tools scripts benchmarks include +SUBDIRS = lib tools scripts benchmarks if BUILD_TESTS SUBDIRS += tests @@ -42,8 +42,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -EXTRA_DIST = \ - meson.build \ - meson.sh \ - $(NULL) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 979b9490..c166d636 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -1,7 +1,5 @@ include Makefile.sources -SUBDIRS = wsim ezbench.d - benchmarks_PROGRAMS = $(benchmarks_prog_list) if HAVE_LIBDRM_INTEL @@ -28,8 +26,3 @@ gem_latency_LDADD = $(LDADD) -lpthread gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gem_syslatency_LDADD = $(LDADD) -lpthread -lrt gem_wsim_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la -lpthread - -EXTRA_DIST= \ - README \ - meson.build \ - $(NULL) diff --git a/benchmarks/ezbench.d/Makefile.am b/benchmarks/ezbench.d/Makefile.am deleted file mode 100644 index 6dbdad1c..00000000 --- a/benchmarks/ezbench.d/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_DIST = \ - gem_blt.test \ - gem_busy.test \ - gem_create.test \ - gem_exec_ctx.test \ - gem_exec_fault.test \ - gem_exec_nop.test \ - gem_exec_reloc.test \ - gem_exec_trace.test \ - gem_latency.test \ - gem_mmap.test \ - gem_prw.test \ - gem_syslatency.test \ - prime_lookup.test \ - vgem_mmap.test \ - $(NULL) diff --git a/benchmarks/wsim/Makefile.am b/benchmarks/wsim/Makefile.am deleted file mode 100644 index 1f23485a..00000000 --- a/benchmarks/wsim/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -EXTRA_DIST = \ - README \ - media_17i7.wsim \ - media_19.wsim \ - media_1n2_480p.wsim \ - media_1n2_asy.wsim \ - media_1n3_480p.wsim \ - media_1n3_asy.wsim \ - media_1n4_480p.wsim \ - media_1n4_asy.wsim \ - media_1n5_480p.wsim \ - media_1n5_asy.wsim \ - media_load_balance_17i7.wsim \ - media_load_balance_19.wsim \ - media_load_balance_4k12u7.wsim \ - media_load_balance_fhd26u7.wsim \ - media_load_balance_hd01.wsim \ - media_load_balance_hd06mp2.wsim \ - media_load_balance_hd12.wsim \ - media_load_balance_hd17i4.wsim \ - media_mfe2_480p.wsim \ - media_mfe3_480p.wsim \ - media_mfe4_480p.wsim \ - media_nn_1080p_s1.wsim \ - media_nn_1080p_s2.wsim \ - media_nn_1080p_s3.wsim \ - media_nn_1080p.wsim \ - media_nn_480p.wsim \ - vcs1.wsim \ - vcs_balanced.wsim \ - $(NULL) diff --git a/configure.ac b/configure.ac index 9b3213e1..c677575d 100644 --- a/configure.ac +++ b/configure.ac @@ -301,8 +301,6 @@ AC_SUBST(REGISTER_FILES) AC_CONFIG_FILES([ Makefile benchmarks/Makefile - benchmarks/ezbench.d/Makefile - benchmarks/wsim/Makefile lib/Makefile lib/tests/Makefile scripts/Makefile @@ -312,7 +310,6 @@ AC_CONFIG_FILES([ tools/null_state_gen/Makefile tools/registers/Makefile include/Makefile - include/drm-uapi/Makefile overlay/Makefile ]) diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 17d75cd1..00000000 --- a/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = . drm-uapi diff --git a/include/drm-uapi/Makefile.am b/include/drm-uapi/Makefile.am deleted file mode 100644 index c658fcc4..00000000 --- a/include/drm-uapi/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -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 \ - sync_file.h \ - tegra_drm.h \ - vc4_drm.h \ - vgem_drm.h \ - via_drm.h \ - virtgpu_drm.h \ - vmwgfx_drm.h \ - $(NULL) diff --git a/lib/Makefile.am b/lib/Makefile.am index 388b8b00..f0bf6459 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -94,9 +94,3 @@ libintel_tools_la_LIBADD = \ $(PIXMAN_LIBS) \ $(GLIB_LIBS) \ -lm - -EXTRA_DIST = \ - dummy.c \ - meson.build \ - version.h.in \ - $(NULL) diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index ad585b77..789fc551 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -22,7 +22,3 @@ LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS) $(T LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) - -EXTRA_DIST = \ - meson.build \ - $(NULL) diff --git a/overlay/Makefile.am b/overlay/Makefile.am index 4cf82dc6..51643e49 100644 --- a/overlay/Makefile.am +++ b/overlay/Makefile.am @@ -70,8 +70,3 @@ intel_gpu_overlay_SOURCES += \ intel_gpu_overlay_SOURCES += $(both_x11_sources) intel_gpu_overlay_LDADD = $(LDADD) -lrt -lm - -EXTRA_DIST= \ - README \ - meson.build \ - $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 803a4861..2f399ce3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -79,12 +79,6 @@ all-local: .gitignore @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@ EXTRA_PROGRAMS = $(HANG) -EXTRA_DIST = \ - $(common_files) \ - $(check_SCRIPTS) \ - generate_testlist.sh \ - meson.build \ - $(NULL) CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore diff --git a/tools/Makefile.am b/tools/Makefile.am index e7de4d90..4f54720f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,7 +33,3 @@ intel_gpu_top_LDADD = $(top_builddir)/lib/libigt_perf.la bin_SCRIPTS = intel_aubdump CLEANFILES = $(bin_SCRIPTS) - -EXTRA_DIST = \ - meson.build \ - $(NULL) diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am index d4aa3d44..d473a897 100644 --- a/tools/null_state_gen/Makefile.am +++ b/tools/null_state_gen/Makefile.am @@ -29,7 +29,3 @@ states: intel_null_state_gen echo "" >>$(h); \ ./intel_null_state_gen $$gen >>$(h); \ done - -EXTRA_DIST = \ - meson.build \ - $(NULL) -- cgit v1.2.3