[PATCH 5/5] xserver: INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Gaetan Nadon
gaetan.nadon at videotron.ca
Tue Nov 10 09:06:02 PST 2009
---------------------------------------------------------------------------
The current state of these files is that a large number of them are
missing or
incorrect. The "foreign" mode isn't set in about half the components. This
sometimes causes build failure because the INSTALL file gets generated which
trips git. Ad hoc fixes are done based on different design assumptions.
I have analysed the current state of affairs for these files. I am using the
wiki NewModuleGuidelines as the reference for the design intent. There is an
agreement that "foreign" must stay as X Window System is not a GNU program
under a GNU project. We are not under the obligation to have these files, we
can pick and choose.
Out of 268 modules, 152 are specifying foreign in either configure.ac (90) or
Makefile.am (62). This should be fixed.
In a non-foreign component, the INSTALL and COPYING file gets generated if
missing. Error messages are printed if NEWS, README and AUTHORS are missing,
but they are not generated. In a foreign component (our case), no files get
generated, no error if some are missing.
INSTALL
-----------------------
There are 164 INSTALL files (95% have zero byte) files checked-in git. Five are
git ignored under the assumption that they are generated by a non-foreign
component. My personal opinion is that file is excellent and has been useful to
me.
-------------------------------------------------------------------------
For xserver, the required INSTALL file was missing.
---
Makefile.am | 9 ++++++---
configure.ac | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8d1eeef..48c9b40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc
+AUTOMAKE_OPTIONS=nostdinc
ACLOCAL_AMFLAGS = -I m4
if COMPOSITE
@@ -58,12 +58,15 @@ DISTCHECK_CONFIGURE_FLAGS=\
DISTCLEANFILES = doltcompile doltlibtool
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
DIST_SUBDIRS = \
doc \
diff --git a/configure.ac b/configure.ac
index 933609a..77ff466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ(2.57)
AC_INIT([xorg-server], 1.7.99.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
RELEASE_DATE="(unreleased)"
AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
--
1.6.0.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20091110/ff7101ad/attachment-0001.htm
More information about the xorg-devel
mailing list