Use standard .gitignore file and layout

Reusing xorg code saves maintenance in the long term.

Now that m4/.gitignore is removed, the -I m4 ${ACLOCAL_FLAGS}
must be removed to avoid build breakage as m4 is generated and not
part of the git source.

Acked-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

9 files changed, 147 insertions, 95 deletions

diff --git a/.gitignore b/.gitignore
index 26058fd2..063aeec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,103 +1,81 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.o
-*.swo
-*.swp
-*~
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
 aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
 compile
 config.guess
 config.h
 config.h.in
 config.log
+config-ml.in
+config.py
 config.status
+config.status.lineno
 config.sub
 configure
-configure.lineno
+configure.scan
 depcomp
+.deps/
+INSTALL
 install-sh
+.libs/
 libtool
+libtool.m4
 ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
 missing
-stamp-h1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xfs
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
+*.swo
+*.swp
 cscope.*
-benchmarks/intel_upload_blit_large
-benchmarks/intel_upload_blit_large_gtt
-benchmarks/intel_upload_blit_large_map
-benchmarks/intel_upload_blit_small
-m4/libtool.m4
-m4/lt*.m4
-tests/getclient
-tests/getstats
-tests/getversion
-tests/gem_basic
-tests/gem_double_irq_loop
-tests/gem_dummy_reloc_loop
-tests/gem_exec_blt
-tests/gem_exec_nop
-tests/gem_exec_bad_domains
-tests/gem_exec_faulting_reloc
-tests/gem_fence_thrash
-tests/gem_fenced_exec_thrash
-tests/gem_flink
-tests/gem_gtt_speed
-tests/gem_largeobject
-tests/gem_mmap
-tests/gem_mmap_gtt
-tests/gem_pipe_control_store_loop
-tests/gem_pread_after_blit
-tests/gem_pwrite
-tests/gem_readwrite
-tests/gem_ringfill
-tests/gem_ring_sync_loop
-tests/gem_linear_blits
-tests/gem_storedw_batches_loop
-tests/gem_storedw_loop_blt
-tests/gem_storedw_loop_bsd
-tests/gem_storedw_loop_render
-tests/gem_vmap_blits
-tests/gem_tiled_blits
-tests/gem_tiled_fence_blits
-tests/gem_tiled_pread
-tests/gem_tiled_pread_pwrite
-tests/gem_partial_pwrite_pread
-tests/gem_unref_active_buffers
-tests/gem_bad_address
-tests/gem_bad_batch
-tests/gem_bad_blit
-tests/gem_bad_length
-tests/gem_hang
-tests/gem_hangcheck_forcewake
-tests/gem_gtt_speed
-tests/gem_stress
-tests/gem_reloc_vs_gpu
-tests/gen3_render_linear_blits
-tests/gen3_render_tiledx_blits
-tests/gen3_render_tiledy_blits
-tests/gen3_render_mixed_blits
-tests/gen3_mixed_blits
-tests/testdisplay
-tools/forcewaked
-tools/intel_backlight
-tools/intel_disable_clock_gating
-tools/intel_dump_decode
-tools/intel_error_decode
-tools/intel_gpu_dump
-tools/intel_gpu_time
-tools/intel_gpu_top
-tools/intel_gtt
-tools/intel_lid
-tools/intel_reg_checker
-tools/intel_reg_dumper
-tools/intel_reg_write
-tools/intel_stepping
-tools/intel_audio_dump
-tools/intel_reg_read
-tools/intel_reg_snapshot
-tools/intel_bios_dumper
-tools/intel_bios_reader
diff --git a/Makefile.am b/Makefile.am
index ed57af67..6c57b837 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 if HAVE_SHADER_DEBUGGER
 SHADER_DEBUGGER_SUBDIR = debugger
 endif
diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
new file mode 100644
index 00000000..ddea6f7e
--- /dev/null
+++ b/benchmarks/.gitignore
@@ -0,0 +1,5 @@
+intel_upload_blit_large
+intel_upload_blit_large_gtt
+intel_upload_blit_large_map
+intel_upload_blit_small
+# Please keep sorted alphabetically
diff --git a/debugger/.gitignore b/debugger/.gitignore
new file mode 100644
index 00000000..873cd273
--- /dev/null
+++ b/debugger/.gitignore
@@ -0,0 +1,2 @@
+debug_rdata
+eudb
diff --git a/debugger/system_routine/.gitignore b/debugger/system_routine/.gitignore
new file mode 100644
index 00000000..dad5fcf1
--- /dev/null
+++ b/debugger/system_routine/.gitignore
@@ -0,0 +1,2 @@
+GNUmakefile
+!Makefile
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 464ba5ca..00000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-libtool.m4
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 00000000..af65d61e
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1 @@
+!*.1
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 00000000..aa4111d9
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,51 @@
+gem_bad_address
+gem_bad_batch
+gem_bad_blit
+gem_bad_length
+gem_basic
+gem_double_irq_loop
+gem_dummy_reloc_loop
+gem_exec_bad_domains
+gem_exec_blt
+gem_exec_faulting_reloc
+gem_exec_nop
+gem_fenced_exec_thrash
+gem_fence_thrash
+gem_flink
+gem_gtt_speed
+gem_gtt_speed
+gem_hang
+gem_hangcheck_forcewake
+gem_largeobject
+gem_linear_blits
+gem_mmap
+gem_mmap_gtt
+gem_partial_pwrite_pread
+gem_pipe_control_store_loop
+gem_pread_after_blit
+gem_pwrite
+gem_readwrite
+gem_reloc_vs_gpu
+gem_ringfill
+gem_ring_sync_loop
+gem_storedw_batches_loop
+gem_storedw_loop_blt
+gem_storedw_loop_bsd
+gem_storedw_loop_render
+gem_stress
+gem_tiled_blits
+gem_tiled_fence_blits
+gem_tiled_pread
+gem_tiled_pread_pwrite
+gem_unref_active_buffers
+gem_vmap_blits
+gen3_mixed_blits
+gen3_render_linear_blits
+gen3_render_mixed_blits
+gen3_render_tiledx_blits
+gen3_render_tiledy_blits
+getclient
+getstats
+getversion
+testdisplay
+# Please keep sorted alphabetically
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..0bbdde1f
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,20 @@
+forcewaked
+intel_audio_dump
+intel_backlight
+intel_bios_dumper
+intel_bios_reader
+intel_disable_clock_gating
+intel_dump_decode
+intel_error_decode
+intel_gpu_dump
+intel_gpu_time
+intel_gpu_top
+intel_gtt
+intel_lid
+intel_reg_checker
+intel_reg_dumper
+intel_reg_read
+intel_reg_snapshot
+intel_reg_write
+intel_stepping
+# Please keep sorted alphabetically