From b65c79395c4e7d54c55894e4c2dfd47b0df9c785 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 26 Oct 2009 12:54:22 -0400 Subject: 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 --- ChangeLog | 98 ------------------------------------------------------------ Makefile.am | 7 +++++ configure.ac | 9 ++++-- 3 files changed, 13 insertions(+), 101 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 97e9ab2..0000000 --- a/ChangeLog +++ /dev/null @@ -1,98 +0,0 @@ -2006-04-07 Adam Jackson - - * configure.ac: - * src/ffb.h: - * src/ffb_dac.c: - * src/ffb_ddc.c: - * src/ffb_dga.c: - * src/ffb_dri.c: - * src/ffb_driver.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. - -2006-01-25 Adam Jackson - - * src/ffb_bcopy.c: - * src/ffb_circle.c: - * src/ffb_driver.c: - Remove xf8_32wid damage, it is going away. - - * src/Makefile.am: - * src/ffb_accel.c: - * src/ffb_bcopy.c: - * src/ffb_checks.c: - * src/ffb_circle.c: - * src/ffb_clip.c: - * src/ffb_clip.h: - * src/ffb_cplane.c: - * src/ffb_dbe.c: - * src/ffb_dga.c: - * src/ffb_dri.c: - * src/ffb_frect.c: - * src/ffb_fspans.c: - * src/ffb_gc.c: - * src/ffb_gc.h: - * src/ffb_glyph.c: - * src/ffb_gspans.c: - * src/ffb_line.c: - * src/ffb_plygon.c: - * src/ffb_point.c: - * src/ffb_rect.c: - * src/ffb_seg.c: - * src/ffb_sspans.c: - * src/ffb_stip.c: - * src/ffb_stip.h: - * src/ffb_stubs.c: - * src/ffb_wline.c: - * src/ffb_zeroarc.c: - Remove remaining cfb-isms and dead accel code. - -2005-12-20 Kevin E. Martin - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-14 Adam Jackson - - * configure.ac: - * src/Makefile.am: - Bug #4890: Include the assembly in the build (Ferris McCormick) - -2005-12-06 Kevin E. Martin - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-20 Adam Jackson - - * configure.ac: - Bump libdrm dep to 2.0. - -2005-11-29 Adam Jackson - - * configure.ac: - Only build dlloader modules by default. - -2005-11-09 Kevin E. Martin - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 7052905..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,10 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 5437811..eb5d5f0 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# 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 @@ -79,9 +85,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=sunffb AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([ Makefile src/Makefile -- cgit v1.2.3