diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:23 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:23 -0400 |
| commit | 7fa8c7184057302a3efc692f0072226b1cee50fa (patch) | |
| tree | f0189bd7d592f1ac15b0d3b4ef21045dc4f60de6 | |
| parent | b3c841f663dda87933b924479b02d18bc3c2b218 (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.am | 1 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index f98b82e..7b7e8e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,4 +28,3 @@ ChangeLog: dist-hook: ChangeLog -CLEANFILES= ChangeLog diff --git a/configure.ac b/configure.ac index a9dcd91..0c5851c 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,11 @@ AC_INIT([xf86-video-wsfb], 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(.) @@ -79,10 +81,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=wsfb AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |