xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore

Gaetan Nadon memsize at videotron.ca
Thu Nov 19 16:28:24 PST 2009


On Thu, 2009-11-19 at 15:34 -0800, Aaron Plattner wrote:

> This causes a significant amount of breakage.  ChangeLog is now no longer
> cleaned by any of the automake clean commands, including maintainer-clean.
> Also, it causes dist to fail when --prefix was not specified:
> 

I'll look into this right away, starting with the most urgent issue,
make dist. The command copies the INSTALL file from the document
directory, $(prefix)/share/doc/util-macros. What looks suspicious is the
NONE/share/doc/util-macros. Is NONE a real directory? You can contact me
directly.


> $ make dist
> (GIT_DIR=./.git git log > ./.changelog.tmp && mv ./.changelog.tmp ./ChangeLog) || (rm -f ./.changelog.tmp; touch ./ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
> if test -f NONE/share/doc/util-macros/INSTALL; then cp -f NONE/share/doc/util-macros/INSTALL .; else echo 'NONE/share/doc/util-macros/INSTALL cannot be found.' >&2; fi 
> NONE/share/doc/util-macros/INSTALL cannot be found.
> { test ! -d "xf86-video-nv-2.1.15" || { find "xf86-video-nv-2.1.15" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "xf86-video-nv-2.1.15"; }; }
> test -d "xf86-video-nv-2.1.15" || mkdir "xf86-video-nv-2.1.15"
> cp: cannot stat `./INSTALL': No such file or directory
> make: *** [distdir] Error 1
> 
> -- Aaron
> 
> On Thu, Nov 19, 2009 at 11:39:56AM -0800, Gaetan Nadon wrote:
> >  .gitignore        |   75 ++++++++++++++++++++++++++++++++++++++++++++++--------
> >  Makefile.am       |   11 ++++---
> >  compat/.gitignore |    1 
> >  configure.ac      |   14 ++++------
> >  man/.gitignore    |    2 -
> >  5 files changed, 78 insertions(+), 25 deletions(-)
> > 
> > New commits:
> > commit 8664df401ff26718608e0bfc319514387d232771
> > 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 9053bb4..0eb97b1 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 = src man compat
> >  
> >  EXTRA_DIST = README.G80
> > commit bbb016dfdca06c34bdc163ee772284a5fc1f1139
> > 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 3c6c5e7..9053bb4 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -23,9 +23,12 @@ SUBDIRS = src man compat
> >  
> >  EXTRA_DIST = README.G80
> >  
> > -.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 6d53025..1947f4d 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -37,7 +37,7 @@ XORG_DEFAULT_OPTIONS
> >  
> >  AC_CONFIG_AUX_DIR(.)
> >  
> > -AM_INIT_AUTOMAKE([dist-bzip2])
> > +AM_INIT_AUTOMAKE([foreign dist-bzip2])
> >  
> >  AM_MAINTAINER_MODE
> >  
> > commit ee24fd1773268e0a593c7de760bafa282f3489a2
> > 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 0891338..3c6c5e7 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -21,9 +21,8 @@
> >  AUTOMAKE_OPTIONS = foreign
> >  SUBDIRS = src man compat
> >  
> > -EXTRA_DIST = README.G80 ChangeLog
> > +EXTRA_DIST = README.G80
> >  
> > -CLEANFILES = ChangeLog
> >  .PHONY: ChangeLog
> >  
> >  ChangeLog:
> > diff --git a/configure.ac b/configure.ac
> > index ce0b884..6d53025 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -29,9 +29,11 @@ AC_INIT([xf86-video-nv],
> >  AC_CONFIG_SRCDIR([Makefile.am])
> >  AM_CONFIG_HEADER([config.h])
> >  
> > -# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
> > -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
> > -XORG_MACROS_VERSION(1.2)
> > +# 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
> >  
> >  AC_CONFIG_AUX_DIR(.)
> >  
> > @@ -136,10 +138,6 @@ AC_SUBST([moduledir])
> >  DRIVER_NAME=nv
> >  AC_SUBST([DRIVER_NAME])
> >  
> > -XORG_MANPAGE_SECTIONS
> > -XORG_RELEASE_VERSION
> > -XORG_CHANGELOG
> > -
> >  AC_OUTPUT([
> >  	Makefile
> >  	src/Makefile
> > commit 57c505852bcf38dc3a3e6a9d603e4a8fd9ed3b80
> > Author: Gaetan Nadon <memsize at videotron.ca>
> > Date:   Thu Oct 22 13:02:49 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/man/.gitignore b/man/.gitignore
> > deleted file mode 100644
> > index 7af9f9e..0000000
> > --- a/man/.gitignore
> > +++ /dev/null
> > @@ -1,2 +0,0 @@
> > -nv.4
> > -nv.4x
> > commit f07ed67a9e14ddc42a96756fbe69cf927c308d1c
> > 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 51efdd8..4317914 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -1,23 +1,78 @@
> > -.deps
> > -.libs
> > -Makefile
> > -Makefile.in
> > -*.la
> > -*.lo
> > +#
> > +#		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.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
> > -release.sh
> > -stamp-h1
> > -ChangeLog
> > +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-nv 
> > +#
> > +#		Edit the following section as needed
> > +# For example, !report.pc overrides *.pc. See 'man gitignore'
> > +# 
> > diff --git a/compat/.gitignore b/compat/.gitignore
> > index 8d30df6..9147dc1 100644
> > --- a/compat/.gitignore
> > +++ b/compat/.gitignore
> > @@ -1,2 +1,3 @@
> > +#		Add & Override for this directory and it's subdirectories
> >  modes
> >  parser
> > _______________________________________________
> > xorg-commit mailing list
> > xorg-commit at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/xorg-commit
> > 
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20091119/202d054e/attachment-0001.html 


More information about the xorg-devel mailing list