summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-26 12:54:21 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-10-26 12:54:21 -0400
commit963be32d684b32957d7e646eb19259d7710bf66a (patch)
treee454396469abbe8a28ffb2b3e30ef16ea3589c3c
parent3e54585250d22541a31068b5b8f0c8743dbccce6 (diff)
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
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac12
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 7fd7bae..5f0278e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,7 @@ README.ati: README.ati.sgml
$(MAKE_TEXT) README.ati.sgml && mv README.ati.txt README.ati
endif
-EXTRA_DIST = README.ati README.ati.sgml ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = README.ati README.ati.sgml
.PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index 2e6bc91..393cab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, 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
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -222,10 +223,7 @@ AC_SUBST([moduledir])
DRIVER_NAME=mach64
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
XORG_CHECK_LINUXDOC
-XORG_CHANGELOG
AC_MSG_NOTICE(
[Please change the Driver line in xorg.conf from "ati" to "mach64"]