xf86-video-intel: 5 commits - configure.ac .gitignore Makefile.am src/bios_reader/.gitignore src/.gitignore src/reg_dumper/.gitignore src/xvmc/.gitignore
Gaetan Nadon
gnadon at kemper.freedesktop.org
Thu Nov 19 11:39:41 PST 2009
.gitignore | 78 ++++++++++++++++++++++++++++++++++++---------
Makefile.am | 11 +++++-
configure.ac | 11 ++++--
src/.gitignore | 6 ---
src/bios_reader/.gitignore | 1
src/reg_dumper/.gitignore | 2 +
src/xvmc/.gitignore | 6 ---
7 files changed, 83 insertions(+), 32 deletions(-)
New commits:
commit c5e86453c3ae3709933779a9dd609bbaebe21e8e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f2d296e..0fbf6b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,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.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = uxa src man
commit 12c4a22dd0b4de92a9c3d9e0baab029292f118f0
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index 9261766..f2d296e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,12 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = uxa src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index fda064a..e090f26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit ad4030932490f848c8ac21ba5a7a8d734994ed15
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 26 12:54:21 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/Makefile.am b/Makefile.am
index 79bdaab..9261766 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,4 +22,9 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = uxa src man
-EXTRA_DIST = README AUTHORS NEWS
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 2348a7a..fda064a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -153,9 +159,6 @@ DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
XORG_CHECK_LINUXDOC
AC_OUTPUT([
commit bb994ce018ae6c3e3c5548ae7439cfc5e9aa4554
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Oct 22 13:02:04 2009 -0400
.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.
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/xvmc/.gitignore b/src/xvmc/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/xvmc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit 67bbda0bddae3e0d39bc8deb7378f467aedfd0e3
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Oct 22 12:34:17 2009 -0400
.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.
diff --git a/.gitignore b/.gitignore
index 998021b..e426a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,78 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.o
-*~
+#
+# 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
-i810.4
-intel.4
-cscope.*
+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 xf86-video-intel
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
\ No newline at end of file
diff --git a/src/bios_reader/.gitignore b/src/bios_reader/.gitignore
index 5055aa5..bc97537 100644
--- a/src/bios_reader/.gitignore
+++ b/src/bios_reader/.gitignore
@@ -1,3 +1,4 @@
+# Add & Override for this directory and it's subdirectories
bios_dumper
swf_dumper
bios_reader
diff --git a/src/reg_dumper/.gitignore b/src/reg_dumper/.gitignore
index 20056b7..fc34443 100644
--- a/src/reg_dumper/.gitignore
+++ b/src/reg_dumper/.gitignore
@@ -1,3 +1,5 @@
+# Add & Override for this directory and it's subdirectories
+intel_audio
intel_gtt
intel_hotplug
intel_reg_dumper
More information about the xorg-commit
mailing list