Crop Makefile.

Signed-off-by: Yi Sun <yi.sun@intel.com>

4 files changed, 4 insertions, 333 deletions

diff --git a/Makefile.am b/Makefile.am
index 4f71a3a6..d36dd0a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,30 +21,5 @@
 
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
-SUBDIRS = lib man tools scripts benchmarks demos overlay
-
-if BUILD_ASSEMBLER
-SUBDIRS += assembler
-endif
-
-if BUILD_SHADER_DEBUGGER
-SUBDIRS += debugger
-endif
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
-
-SUBDIRS += docs
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
+#SUBDIRS = lib man tools scripts benchmarks demos overlay
+SUBDIRS = lib tests
diff --git a/configure.ac b/configure.ac
index 16d6a2ef..ba541f6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_SYS_LARGEFILE
 AC_GNU_SOURCE
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
 AM_PATH_PYTHON([3],, [:])
 
 AC_PROG_CC
@@ -211,27 +211,9 @@ AC_SUBST(QUICK_DUMP_EXTRA_DIST)
 
 AC_CONFIG_FILES([
 		 Makefile
-		 benchmarks/Makefile
-		 demos/Makefile
-		 docs/Makefile
-		 docs/reference/Makefile
-		 docs/reference/intel-gpu-tools/Makefile
-		 docs/reference/intel-gpu-tools/version.xml
 		 lib/Makefile
 		 lib/tests/Makefile
-		 man/Makefile
-		 scripts/Makefile
 		 tests/Makefile
-		 tools/Makefile
-		 tools/quick_dump/Makefile
-		 tools/null_state_gen/Makefile
-		 debugger/Makefile
-		 debugger/system_routine/Makefile
-		 assembler/Makefile
-		 assembler/doc/Makefile
-		 assembler/test/Makefile
-		 assembler/intel-gen4asm.pc
-		 overlay/Makefile
 		 ])
 AC_OUTPUT
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5efc8d8c..006555e2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,36 +1,11 @@
 include Makefile.sources
 
-if HAVE_NOUVEAU
-    TESTS_progs_M += $(NOUVEAU_TESTS_M)
-endif
-
 if BUILD_TESTS
-all-local: single-tests.txt multi-tests.txt
-
-list-single-tests:
-	@echo TESTLIST
-	@echo ${single_kernel_tests}
-	@echo END TESTLIST
-
-list-multi-tests:
-	@echo TESTLIST
-	@echo ${multi_kernel_tests}
-	@echo END TESTLIST
-
-single-tests.txt: Makefile.sources
-	@echo TESTLIST > $@
-	@echo ${single_kernel_tests} >> $@
-	@echo END TESTLIST >> $@
-
-multi-tests.txt: Makefile.sources
-	@echo TESTLIST > $@
-	@echo ${multi_kernel_tests} >> $@
-	@echo END TESTLIST >> $@
 
 EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
 EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
 
-CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt
+CLEANFILES = $(EXTRA_PROGRAMS)
 
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
 	-I$(srcdir)/.. \
@@ -44,43 +19,5 @@ LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS)
 LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS)
 AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
 
-drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-drm_import_export_LDADD = $(LDADD) -lpthread
-gem_close_race_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_close_race_LDADD = $(LDADD) -lpthread
-gem_ctx_basic_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_ctx_basic_LDADD = $(LDADD) -lpthread
-gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_ctx_thrash_LDADD = $(LDADD) -lpthread
-gem_fence_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_fence_thrash_LDADD = $(LDADD) -lpthread
-gem_fence_upload_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_fence_upload_LDADD = $(LDADD) -lpthread
-gem_flink_race_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_flink_race_LDADD = $(LDADD) -lpthread
-gem_mmap_gtt_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_mmap_gtt_LDADD = $(LDADD) -lpthread
-gem_mmap_wc_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_mmap_wc_LDADD = $(LDADD) -lpthread
-gem_threaded_access_tiled_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_threaded_access_tiled_LDADD = $(LDADD) -lpthread
-gem_tiled_swapping_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_tiled_swapping_LDADD = $(LDADD) -lpthread
-prime_self_import_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-prime_self_import_LDADD = $(LDADD) -lpthread
-gen7_forcewake_mt_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gen7_forcewake_mt_LDADD = $(LDADD) -lpthread
-gem_userptr_blits_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_userptr_blits_LDADD = $(LDADD) -lpthread
-
-gem_wait_LDADD = $(LDADD) -lrt
-kms_flip_LDADD = $(LDADD) -lrt -lpthread
-
-prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
 endif
 
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 51e8376b..623a7483 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -1,227 +1,8 @@
 noinst_PROGRAMS = \
-	gem_alive \
-	gem_stress \
 	$(TESTS_progs) \
-	$(TESTS_progs_M) \
-	$(HANG) \
-	$(TESTS_testsuite) \
-	$(NULL)
-
-NOUVEAU_TESTS_M = \
-	prime_nv_api \
-	prime_nv_pcopy \
-	prime_nv_test \
-	$(NULL)
-
-TESTS_progs_M = \
-	core_get_client_auth \
-	drv_suspend \
-	drv_hangman \
-	gem_bad_reloc \
-	gem_basic \
-	gem_caching \
-	gem_close_race \
-	gem_concurrent_blit \
-	gem_cs_tlb \
-	gem_ctx_param_basic \
-	gem_ctx_bad_exec \
-	gem_ctx_exec \
-	gem_dummy_reloc_loop \
-	gem_evict_alignment \
-	gem_evict_everything \
-	gem_exec_bad_domains \
-	gem_exec_faulting_reloc \
-	gem_exec_nop \
-	gem_exec_params \
-	gem_exec_parse \
-	gem_fenced_exec_thrash \
-	gem_fence_thrash \
-	gem_fence_upload \
-	gem_flink \
-	gem_flink_race \
-	gem_linear_blits \
-	gem_madvise \
-	gem_mmap \
-	gem_mmap_gtt \
-	gem_mmap_wc \
-	gem_partial_pwrite_pread \
-	gem_persistent_relocs \
-	gem_pipe_control_store_loop \
-	gem_ppgtt \
-	gem_pread \
-	gem_pread_after_blit \
-	gem_pwrite \
-	gem_pwrite_pread \
-	gem_readwrite \
-	gem_reloc_overflow \
-	gem_reloc_vs_gpu \
-	gem_render_copy_redux \
-	gem_reset_stats \
-	gem_ringfill \
-	gem_set_tiling_vs_blt \
-	gem_storedw_batches_loop \
-	gem_tiled_blits \
-	gem_tiled_partial_pwrite_pread \
-	gem_userptr_blits \
-	gem_write_read_ring_switch \
-	kms_addfb \
-	kms_cursor_crc \
-	kms_fbc_crc \
-	kms_flip \
-	kms_flip_event_leak \
-	kms_flip_tiling \
-	kms_mmio_vs_cs_flip \
-	kms_pipe_crc_basic \
-	kms_plane \
-	kms_psr_sink_crc \
-	kms_render \
-	kms_rotation_crc \
-	kms_setmode \
-	kms_universal_plane \
-	pm_lpsp \
-	pm_rpm \
-	pm_rps \
-	pm_rc6_residency \
-	prime_self_import \
-	template \
 	$(NULL)
 
 TESTS_progs = \
-	core_getclient \
-	core_getstats \
-	core_getversion \
-	drm_import_export \
-	drm_read \
-	drm_vma_limiter \
-	drm_vma_limiter_cached \
-	drm_vma_limiter_cpu \
-	drm_vma_limiter_gtt \
-	gem_bad_length \
-	gem_cpu_reloc \
-	gem_cs_prefetch \
-	gem_ctx_bad_destroy \
-	gem_ctx_basic \
-	gem_ctx_create \
-	gem_ctx_thrash \
-	gem_double_irq_loop \
-	gem_exec_big \
-	gem_exec_blt \
-	gem_exec_lut_handle \
-	gem_fd_exhaustion \
-	gem_gtt_cpu_tlb \
-	gem_gtt_hog \
-	gem_gtt_speed \
-	gem_hangcheck_forcewake \
-	gem_largeobject \
-	gem_lut_handle \
-	gem_mmap_offset_exhaustion \
-	gem_media_fill \
-	gem_gpgpu_fill \
-	gem_pin \
-	gem_reg_read \
-	gem_render_copy \
-	gem_render_linear_blits \
-	gem_render_tiled_blits \
-	gem_ring_sync_copy \
-	gem_ring_sync_loop \
-	gem_multi_bsd_sync_loop \
-	gem_seqno_wrap \
-	gem_set_tiling_vs_gtt \
-	gem_set_tiling_vs_pwrite \
-	gem_storedw_loop_blt \
-	gem_storedw_loop_bsd \
-	gem_storedw_loop_render \
-	gem_storedw_loop_vebox \
-	gem_threaded_access_tiled \
-	gem_tiled_fence_blits \
-	gem_tiled_pread \
-	gem_tiled_pread_pwrite \
-	gem_tiled_swapping \
-	gem_tiled_wb \
-	gem_tiled_wc \
-	gem_tiling_max_stride \
-	gem_unfence_active_buffers \
-	gem_unref_active_buffers \
-	gem_wait \
-	gem_workarounds \
-	gen3_mixed_blits \
-	gen3_render_linear_blits \
-	gen3_render_mixed_blits \
-	gen3_render_tiledx_blits \
-	gen3_render_tiledy_blits \
-	gen7_forcewake_mt \
-	kms_3d \
-	kms_fence_pin_leak \
-	kms_force_connector \
-	kms_pwrite_crc \
-	kms_sink_crc_basic \
-	prime_udl \
-	$(NULL)
-
-# IMPORTANT: The ZZ_ tests need to be run last!
-# ... and make can't deal with inlined comments ...
-TESTS_scripts_M = \
-	$(NULL)
-
-TESTS_scripts = \
-	debugfs_emon_crash \
-	drv_debugfs_reader \
-	drv_missed_irq_hang \
-	drv_module_reload \
-	kms_sysfs_edid_timing \
-	sysfs_l3_parity \
-	test_rte_check \
-	tools_test \
-	$(NULL)
-
-# This target contains testcases which support automagic subtest enumeration
-# from the piglit testrunner with --list-subtests and running individual
-# subtests with --run-subtest <testname>
-#
-# Your testcase should probably use an igt_main and igt_fixture and should have
-# a pile of igt_subtest blocks.
-multi_kernel_tests = \
-	$(TESTS_progs_M) \
-	$(TESTS_scripts_M) \
-	$(NULL)
-
-# This target is for simple testcase which don't expose any subtest.
-#
-# Your testcase should probably use igt_simple_main, but none of the other magic
-# blocks like igt_fixture or igt_subtest.
-single_kernel_tests = \
-	$(TESTS_progs) \
-	$(TESTS_scripts) \
-	$(NULL)
-
-kernel_tests = \
-	$(single_kernel_tests) \
-	$(multi_kernel_tests) \
-	$(NULL)
-
-# Test that exercise specific asserts in the test framework library and are
-# hence expected to fail.
-XFAIL_TESTS = \
-	igt_no_exit \
-	igt_no_exit_list_only \
-	igt_no_subtest \
-	$(NULL)
-
-# IMPORTANT: These tests here are all disabled because the result in sometime
-# unrecoverable gpu hangs. Don't put real testcases here.
-HANG = \
-	gem_bad_batch \
-	gem_hang \
-	gem_bad_blit \
-	gem_bad_address \
-	gem_non_secure_batch \
-	$(NULL)
-
-scripts = \
-	check_drm_clients \
-	ddx_intel_after_fbdev \
-	debugfs_wedged \
-	drm_lib.sh \
 	$(NULL)
 
 IMAGES = pass.png 1080p-left.png 1080p-right.png
@@ -233,7 +14,3 @@ testdisplay_SOURCES = \
 	$(NULL)
 
 TESTS_progs += testdisplay
-
-common_files = \
-	       eviction_common.c \
-	       $(NULL)