summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-11-10 08:56:21 -0500
committerKeith Packard <keithp@keithp.com>2009-11-11 21:40:20 -0800
commitc739beb439bb813e4c82b3216daee7e89aa96f2f (patch)
tree764f980d99898d323c453c5b2dcf3ab074647d5c
parent9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4 (diff)
.gitignore: use common defaults with custom section #24239
Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--.gitignore206
-rw-r--r--dix/.gitignore3
-rw-r--r--doc/.gitignore4
-rw-r--r--hw/dmx/.gitignore4
-rw-r--r--hw/dmx/config/.gitignore13
-rw-r--r--hw/dmx/doc/.gitignore2
-rw-r--r--hw/dmx/examples/.gitignore17
-rw-r--r--hw/kdrive/ephyr/.gitignore2
-rw-r--r--hw/kdrive/fake/.gitignore2
-rw-r--r--hw/kdrive/fbdev/.gitignore2
-rw-r--r--hw/kdrive/sdl/.gitignore2
-rw-r--r--hw/vfb/.gitignore5
-rw-r--r--hw/xfree86/.gitignore7
-rw-r--r--hw/xfree86/common/.gitignore3
-rw-r--r--hw/xfree86/doc/man/.gitignore8
-rw-r--r--hw/xfree86/exa/.gitignore2
-rw-r--r--hw/xfree86/fbdevhw/.gitignore4
-rw-r--r--hw/xfree86/loader/.gitignore3
-rw-r--r--hw/xfree86/os-support/.gitignore2
-rw-r--r--hw/xfree86/ramdac/.gitignore2
-rw-r--r--hw/xfree86/utils/cvt/.gitignore3
-rw-r--r--hw/xfree86/utils/gtf/.gitignore5
-rw-r--r--hw/xfree86/xaa/.gitignore4
-rw-r--r--hw/xnest/.gitignore5
-rw-r--r--hw/xquartz/mach-startup/.gitignore8
-rw-r--r--hw/xwin/.gitignore5
-rw-r--r--include/.gitignore5
-rw-r--r--os/.gitignore2
-rw-r--r--test/.gitignore2
29 files changed, 170 insertions, 162 deletions
diff --git a/.gitignore b/.gitignore
index 7f48ad2f2..72390a0c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,154 +1,80 @@
-ChangeLog
-Makefile
-Makefile.in
-.deps
-.libs
-.msg
-*.lo
-*.la
-*.a
-*.o
-*~
-.*sw?
-*.pbxuser
-*.mode1v3
-*.patch
-*.exe
-obj*
-build*
-cscope*
-local
+#
+# 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
-doltcompile
-doltlibtool
+.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
-TAGS
-tags
-cscope*
-ylwrap
-xorg-server.pc
-xorg-server-*.tar.bz2
-xorg-server-*.tar.gz
+mkinstalldirs
+*.pc
+py-compile
stamp-h?
-dix/Xserver-dtrace.h
-do-not-use-config.h
-do-not-use-config.h.in
-dix/dix.c
-os/os.c
-doc/Xserver.1x
-doc/Xserver.man
-hw/dmx/Xdmx
-hw/dmx/Xdmx.1x
-hw/dmx/config/dmxtodmx
-hw/dmx/config/dmxtodmx.1x
-hw/dmx/config/parser.c
-hw/dmx/config/parser.h
-hw/dmx/config/scanner.c
-hw/dmx/config/vdltodmx
-hw/dmx/config/vdltodmx.1x
-hw/dmx/config/xdmxconfig
-hw/dmx/config/xdmxconfig.1x
-hw/dmx/examples/dmxaddinput
-hw/dmx/examples/dmxaddscreen
-hw/dmx/examples/dmxreconfig
-hw/dmx/examples/dmxresize
-hw/dmx/examples/dmxrminput
-hw/dmx/examples/dmxrmscreen
-hw/dmx/examples/dmxwininfo
-hw/dmx/examples/ev
-hw/dmx/examples/evi
-hw/dmx/examples/res
-hw/dmx/examples/xbell
-hw/dmx/examples/xdmx
-hw/dmx/examples/xinput
-hw/dmx/examples/xled
-hw/dmx/examples/xtest
-hw/kdrive/ephyr/Xephyr
-hw/kdrive/fake/Xfake
-hw/kdrive/fbdev/Xfbdev
-hw/kdrive/vesa/Xvesa
-hw/vfb/Xvfb
-hw/vfb/Xvfb.1x
-hw/vfb/Xvfb.man
-hw/xfree86/Xorg
-hw/xfree86/common/xf86Build.h
-hw/xfree86/common/xf86DefModeSet.c
-hw/xfree86/doc/man/Xorg.1x
-hw/xfree86/doc/man/Xorg.man
-hw/xfree86/doc/man/xorg.conf.5x
-hw/xfree86/doc/man/xorg.conf.man
-hw/xfree86/exa/exa.4
-hw/xfree86/exa/exa.4x
-hw/xfree86/exa/exa.man
-hw/xfree86/fbdevhw/fbdevhw.4x
-hw/xfree86/fbdevhw/fbdevhw.man
-hw/xfree86/os-support/xorgos.c
-hw/xfree86/osandcommon.c
-hw/xfree86/ramdac/xf86BitOrder.c
-hw/xfree86/utils/cvt/cvt
-hw/xfree86/utils/cvt/cvt.man
-hw/xfree86/utils/gtf/gtf
-hw/xfree86/utils/gtf/gtf.1x
-hw/xfree86/utils/gtf/gtf.man
-hw/xfree86/xaa/l-xaaBitmap.c
-hw/xfree86/xaa/l-xaaStipple.c
-hw/xfree86/xaa/l-xaaTEGlyph.c
-hw/xfree86/xaa/l3-xaaBitmap.c
-hw/xfree86/xaa/l3-xaaStipple.c
-hw/xfree86/xaa/lf-xaaBitmap.c
-hw/xfree86/xaa/lf-xaaStipple.c
-hw/xfree86/xaa/lf-xaaTEGlyph.c
-hw/xfree86/xaa/lf3-xaaBitmap.c
-hw/xfree86/xaa/lf3-xaaStipple.c
-hw/xfree86/xaa/m-xaaBitmap.c
-hw/xfree86/xaa/m-xaaStipple.c
-hw/xfree86/xaa/m-xaaTEGlyph.c
-hw/xfree86/xaa/m3-xaaBitmap.c
-hw/xfree86/xaa/m3-xaaStipple.c
-hw/xfree86/xaa/mf-xaaBitmap.c
-hw/xfree86/xaa/mf-xaaStipple.c
-hw/xfree86/xaa/mf-xaaTEGlyph.c
-hw/xfree86/xaa/mf3-xaaBitmap.c
-hw/xfree86/xaa/mf3-xaaStipple.c
-hw/xfree86/xaa/s-xaaDashLine.c
-hw/xfree86/xaa/s-xaaLine.c
-hw/xfree86/xorg.c
-hw/xfree86/libxorg.c
-hw/xfree86/loader/sdksyms.c
-hw/xfree86/xorg.conf.example
-hw/xfree86/xorg.conf.example.pre
-hw/xnest/Xnest
-hw/xnest/Xnest.1x
-hw/xnest/Xnest.man
-hw/xquartz/bundle/Info.plist
-hw/xquartz/mach-startup/mach_startup.h
-hw/xquartz/mach-startup/mach_startupServer.c
-hw/xquartz/mach-startup/mach_startupServer.h
-hw/xquartz/mach-startup/mach_startupUser.c
-hw/xquartz/mach-startup/X11.bin
-hw/xquartz/mach-startup/Xquartz
-hw/xquartz/doc/Xquartz.1
-hw/xwin/winprefslex.c
-hw/xwin/winprefsyacc.c
-hw/xwin/winprefsyacc.h
-include/dix-config.h
-include/kdrive-config.h
-include/version-config.h
-include/xkb-config.h
-include/xorg-config.h
-include/xorg-server.h
-include/xwin-config.h
-sdksyms.dep
+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 xserver
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
+doltcompile
+doltlibtool
diff --git a/dix/.gitignore b/dix/.gitignore
new file mode 100644
index 000000000..63ee76774
--- /dev/null
+++ b/dix/.gitignore
@@ -0,0 +1,3 @@
+# Add & Override for this directory and it's subdirectories
+dix.c
+Xserver-dtrace.h
diff --git a/doc/.gitignore b/doc/.gitignore
index fa5407dda..952f52857 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,2 +1,2 @@
-Xserver.1
-Xserver.1x
+# Add & Override for this directory and it's subdirectories
+Xserver.man
diff --git a/hw/dmx/.gitignore b/hw/dmx/.gitignore
index 9763d86a2..4dd9b0358 100644
--- a/hw/dmx/.gitignore
+++ b/hw/dmx/.gitignore
@@ -1,2 +1,2 @@
-Xdmx.1
-Xdmx.1x
+# Add & Override for this directory and it's subdirectories
+Xdmx
diff --git a/hw/dmx/config/.gitignore b/hw/dmx/config/.gitignore
index bb129dfa3..086062204 100644
--- a/hw/dmx/config/.gitignore
+++ b/hw/dmx/config/.gitignore
@@ -1,6 +1,7 @@
-dmxtodmx.1
-dmxtodmx.1x
-vdltodmx.1
-vdltodmx.1x
-xdmxconfig.1
-xdmxconfig.1x
+# Add & Override for this directory and it's subdirectories
+dmxtodmx
+parser.c
+parser.h
+scanner.c
+vdltodmx
+xdmxconfig
diff --git a/hw/dmx/doc/.gitignore b/hw/dmx/doc/.gitignore
new file mode 100644
index 000000000..5bfaef372
--- /dev/null
+++ b/hw/dmx/doc/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+html/
diff --git a/hw/dmx/examples/.gitignore b/hw/dmx/examples/.gitignore
new file mode 100644
index 000000000..5a86a7106
--- /dev/null
+++ b/hw/dmx/examples/.gitignore
@@ -0,0 +1,17 @@
+# Add & Override for this directory and it's subdirectories
+dmxaddinput
+dmxaddscreen
+dmxreconfig
+dmxresize
+dmxrminput
+dmxrmscreen
+dmxwininfo
+ev
+evi
+res
+xbell
+xdmx
+xinput
+xled
+xtest
+
diff --git a/hw/kdrive/ephyr/.gitignore b/hw/kdrive/ephyr/.gitignore
new file mode 100644
index 000000000..f35f006c2
--- /dev/null
+++ b/hw/kdrive/ephyr/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+Xephyr
diff --git a/hw/kdrive/fake/.gitignore b/hw/kdrive/fake/.gitignore
new file mode 100644
index 000000000..12a25cc4f
--- /dev/null
+++ b/hw/kdrive/fake/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+Xfake
diff --git a/hw/kdrive/fbdev/.gitignore b/hw/kdrive/fbdev/.gitignore
new file mode 100644
index 000000000..80ad26623
--- /dev/null
+++ b/hw/kdrive/fbdev/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+Xfbdev
diff --git a/hw/kdrive/sdl/.gitignore b/hw/kdrive/sdl/.gitignore
new file mode 100644
index 000000000..072341b32
--- /dev/null
+++ b/hw/kdrive/sdl/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+Xsdl
diff --git a/hw/vfb/.gitignore b/hw/vfb/.gitignore
index e3225f65b..55076f01d 100644
--- a/hw/vfb/.gitignore
+++ b/hw/vfb/.gitignore
@@ -1,2 +1,3 @@
-Xvfb.1
-Xvfb.1x
+# Add & Override for this directory and it's subdirectories
+Xvfb
+Xvfb.man
diff --git a/hw/xfree86/.gitignore b/hw/xfree86/.gitignore
new file mode 100644
index 000000000..813af0b97
--- /dev/null
+++ b/hw/xfree86/.gitignore
@@ -0,0 +1,7 @@
+# Add & Override for this directory and it's subdirectories
+libxorg.c
+Xorg
+xorg.c
+xorg.conf.example
+xorg.conf.example.pre
+
diff --git a/hw/xfree86/common/.gitignore b/hw/xfree86/common/.gitignore
new file mode 100644
index 000000000..81e8416d2
--- /dev/null
+++ b/hw/xfree86/common/.gitignore
@@ -0,0 +1,3 @@
+# Add & Override for this directory and it's subdirectories
+xf86Build.h
+xf86DefModeSet.c
diff --git a/hw/xfree86/doc/man/.gitignore b/hw/xfree86/doc/man/.gitignore
index d412e511b..7a16e4a29 100644
--- a/hw/xfree86/doc/man/.gitignore
+++ b/hw/xfree86/doc/man/.gitignore
@@ -1,4 +1,4 @@
-Xorg.1
-Xorg.1x
-xorg.conf.5
-xorg.conf.5x
+# Add & Override for this directory and it's subdirectories
+Xorg
+Xorg.man
+xorg.conf.man
diff --git a/hw/xfree86/exa/.gitignore b/hw/xfree86/exa/.gitignore
new file mode 100644
index 000000000..d20a82fb5
--- /dev/null
+++ b/hw/xfree86/exa/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+exa.man
diff --git a/hw/xfree86/fbdevhw/.gitignore b/hw/xfree86/fbdevhw/.gitignore
index 4c8446c75..88d61c605 100644
--- a/hw/xfree86/fbdevhw/.gitignore
+++ b/hw/xfree86/fbdevhw/.gitignore
@@ -1,2 +1,2 @@
-fbdevhw.4
-fbdevhw.4x
+# Add & Override for this directory and it's subdirectories
+fbdevhw.man
diff --git a/hw/xfree86/loader/.gitignore b/hw/xfree86/loader/.gitignore
new file mode 100644
index 000000000..6b38d9ea9
--- /dev/null
+++ b/hw/xfree86/loader/.gitignore
@@ -0,0 +1,3 @@
+# Add & Override for this directory and it's subdirectories
+sdksyms.c
+sdksyms.dep
diff --git a/hw/xfree86/os-support/.gitignore b/hw/xfree86/os-support/.gitignore
new file mode 100644
index 000000000..f2206cdd2
--- /dev/null
+++ b/hw/xfree86/os-support/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+xorgos.c
diff --git a/hw/xfree86/ramdac/.gitignore b/hw/xfree86/ramdac/.gitignore
new file mode 100644
index 000000000..c55c8c1ab
--- /dev/null
+++ b/hw/xfree86/ramdac/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+xf86BitOrder.c
diff --git a/hw/xfree86/utils/cvt/.gitignore b/hw/xfree86/utils/cvt/.gitignore
new file mode 100644
index 000000000..7816fd7c6
--- /dev/null
+++ b/hw/xfree86/utils/cvt/.gitignore
@@ -0,0 +1,3 @@
+# Add & Override for this directory and it's subdirectories
+cvt
+cvt.man
diff --git a/hw/xfree86/utils/gtf/.gitignore b/hw/xfree86/utils/gtf/.gitignore
index 741071d52..9aebbbb60 100644
--- a/hw/xfree86/utils/gtf/.gitignore
+++ b/hw/xfree86/utils/gtf/.gitignore
@@ -1,2 +1,3 @@
-gtf.1
-gtf.1x
+# Add & Override for this directory and it's subdirectories
+gtf
+gtf.man
diff --git a/hw/xfree86/xaa/.gitignore b/hw/xfree86/xaa/.gitignore
new file mode 100644
index 000000000..1211d01e1
--- /dev/null
+++ b/hw/xfree86/xaa/.gitignore
@@ -0,0 +1,4 @@
+# Add & Override for this directory and it's subdirectories
+[lms]-xaa*.c
+[lm]f3-xaa*.c
+[lm][f3]-xaa*.c
diff --git a/hw/xnest/.gitignore b/hw/xnest/.gitignore
index fc92eb176..16db15e20 100644
--- a/hw/xnest/.gitignore
+++ b/hw/xnest/.gitignore
@@ -1,2 +1,3 @@
-Xnest.1
-Xnest.1x
+# Add & Override for this directory and it's subdirectories
+Xnest
+Xnest.man
diff --git a/hw/xquartz/mach-startup/.gitignore b/hw/xquartz/mach-startup/.gitignore
new file mode 100644
index 000000000..374abbfbe
--- /dev/null
+++ b/hw/xquartz/mach-startup/.gitignore
@@ -0,0 +1,8 @@
+# Add & Override for this directory and it's subdirectories
+mach_startup.h
+mach_startupServer.c
+mach_startupServer.h
+mach_startupUser.c
+X11.bin
+Xquartz
+
diff --git a/hw/xwin/.gitignore b/hw/xwin/.gitignore
new file mode 100644
index 000000000..a99695030
--- /dev/null
+++ b/hw/xwin/.gitignore
@@ -0,0 +1,5 @@
+# Add & Override for this directory and it's subdirectories
+winprefslex.c
+winprefsyacc.c
+winprefsyacc.h
+
diff --git a/include/.gitignore b/include/.gitignore
new file mode 100644
index 000000000..dc9067ab3
--- /dev/null
+++ b/include/.gitignore
@@ -0,0 +1,5 @@
+# Add & Override for this directory and it's subdirectories
+*-config.h
+do-not-use-config.h.in
+xorg-server.h
+
diff --git a/os/.gitignore b/os/.gitignore
new file mode 100644
index 000000000..74b1d142c
--- /dev/null
+++ b/os/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+os.c
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..ed97e8171
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+libxservertest.c