Re: xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore
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:
$ 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 mems...@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 mems...@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 mems...@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 mems...@videotron.ca
Date: Thu Oct 22 13:02:49 2009 -0400
Re: xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore
On Thu, 2009-11-19 at 16:34 -0800, Aaron Plattner wrote:
On Thu, Nov 19, 2009 at 04:28:24PM -0800, Gaetan Nadon wrote:
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.
No, I just didn't specify it on the command line. The fundamental problem
is that it's trying to use the package's --prefix to find the INSTALL file
from util-macros, which may have been installed at a different prefix:
$ ./configure --prefix=/no-such-directory
checking for gcc... gcc
checking for C compiler default output file name... a.out
[..etc..]
$ 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 /no-such-directory/share/doc/util-macros/INSTALL; then cp -f
/no-such-directory/share/doc/util-macros/INSTALL .; else echo
'/no-such-directory/share/doc/util-macros/INSTALL cannot be found.' 2; fi
/no-such-directory/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
Note that it's trying to copy from
/no-such-directory/share/doc/util-macros/INSTALL even though util-macros
was installed with --prefix=/usr.
You're right, there was a hidden assumption that the prefix of
util-macros was known. I don't think there is a reliable way of finding
this information. This was an attempt to save from having to check-in
250 INSTALL file. A large number of modules did not have any. It looks
like this is the only alternative now.
To recover, the target from Makefile.am can be removed. As long as the
INSTALL file is present in the root directory, it will be included in
the tarball by Automake. Just for completeness, note that .gitignore has
an entry to ignore INSTALL as it was intended to be generated.
It is true that ChangeLog, INSTALL NEWS, AUTHORS and some other files
cannot be deleted. This is a designed behaviour by autoconf/automake. I
have seen on the net not everyone agrees with that.
Would you like me to create a patch right now?
Peter: Note that, like ChangeLog, INSTALL is also not cleaned by anything
short of a git clean -xf so you probably have one laying around from
earlier.
-- Aaron
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel
Re: xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore
On Thu, Nov 19, 2009 at 05:09:59PM -0800, Gaetan Nadon wrote:
On Thu, 2009-11-19 at 16:34 -0800, Aaron Plattner wrote:
On Thu, Nov 19, 2009 at 04:28:24PM -0800, Gaetan Nadon wrote:
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.
No, I just didn't specify it on the command line. The fundamental problem
is that it's trying to use the package's --prefix to find the INSTALL file
from util-macros, which may have been installed at a different prefix:
$ ./configure --prefix=/no-such-directory
checking for gcc... gcc
checking for C compiler default output file name... a.out
[..etc..]
$ 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 /no-such-directory/share/doc/util-macros/INSTALL; then cp -f
/no-such-directory/share/doc/util-macros/INSTALL .; else echo
'/no-such-directory/share/doc/util-macros/INSTALL cannot be found.' 2; fi
/no-such-directory/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
Note that it's trying to copy from
/no-such-directory/share/doc/util-macros/INSTALL even though util-macros
was installed with --prefix=/usr.
You're right, there was a hidden assumption that the prefix of
util-macros was known. I don't think there is a reliable way of finding
this information. This was an attempt to save from having to check-in 250
INSTALL file. A large number of modules did not have any. It looks like
this is the only alternative now.
To recover, the target from Makefile.am can be removed. As long as the
INSTALL file is present in the root directory, it will be included in the
tarball by Automake. Just for completeness, note that .gitignore has an
entry to ignore INSTALL as it was intended to be generated.
Just checking them in to each module sounds reasonable to me, but I'd be
interested to see what others think. I don't it's ultra-urgent that this
be fixed right away.
It is true that ChangeLog, INSTALL NEWS, AUTHORS and some other files
cannot be deleted. This is a designed behaviour by autoconf/automake. I
have seen on the net not everyone agrees with that.
If they're checked into the git repository, that sounds right. If they're
generated though, like ChangeLog is, then at least maintainer-clean (and
probably also clean or even mostlyclean) ought to clean it. The automake
documentation describes the clean rules this way:
• If make built it, and it is commonly something that one would want to
rebuild (for instance, a ‘.o’ file), then mostlyclean should delete it.
• Otherwise, if make built it, then clean should delete it.
• If configure built it, then distclean should delete it.
• If the maintainer built it (for instance, a ‘.info’ file), then
maintainer-clean should delete it. However maintainer-clean should not
delete anything that needs to exist in order to run ‘./configure
make’.
-- Aaron
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel
Re: xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore
Aaron Plattner wrote: It is true that ChangeLog, INSTALL NEWS, AUTHORS and some other files cannot be deleted. This is a designed behaviour by autoconf/automake. I have seen on the net not everyone agrees with that. If they're checked into the git repository, that sounds right. If they're generated though, like ChangeLog is, then at least maintainer-clean (and probably also clean or even mostlyclean) ought to clean it. The automake documentation describes the clean rules this way: clean should not, since there's no way for a tarball user to get it back. maintainer-clean should, which is what was previously done, since that will only be active for people building from git, especially now that autogen.sh is not included in the tarballs. -- -Alan Coopersmith- alan.coopersm...@sun.com Sun Microsystems, Inc. - X Window System Engineering ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: xf86-video-nv: 5 commits - compat/.gitignore configure.ac .gitignore Makefile.am man/.gitignore
On Thu, Nov 19, 2009 at 08:09:59PM -0500, Gaetan Nadon wrote: On Thu, 2009-11-19 at 16:34 -0800, Aaron Plattner wrote: Note that it's trying to copy from /no-such-directory/share/doc/util-macros/INSTALL even though util-macros was installed with --prefix=/usr. You're right, there was a hidden assumption that the prefix of util-macros was known. I don't think there is a reliable way of finding this information. This was an attempt to save from having to check-in 250 INSTALL file. A large number of modules did not have any. It looks like this is the only alternative now. How about making xorg-macros install a .pc file, then pkg-config --variable=prefix xorg-macros? Cheers, Daniel pgpsQivIl3ObV.pgp Description: PGP signature ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
