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
commit7b583191fa46919730727a0cffe44e7ac6631591 (patch)
tree69ee4b8960482a46912273f2dc9cf78edde7a5da
parent6b5e30a2df432cffa90a71c63dbd6ab0aef6203f (diff)
downloadxorg-driver-xf86-video-fbdev-7b583191fa46919730727a0cffe44e7ac6631591.tar.gz
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--ChangeLog66
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac9
3 files changed, 13 insertions, 69 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ead4bce..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2006-05-19 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/fbdev.c:
- Bump to 0.3.0
-
-2006-05-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * src/fbdev.c: (FBDevShadowInit), (FBDevScreenInit),
- (FBDevCloseScreen):
- Fix ShadowFB support to work with recent miext/shadow changes from
- bug #5460 (Kevin Martin), and apply fix for miext/shadow crasher
- https://bugs.freedesktop.org/show_bug.cgi?id=6940 (Kristian
- Hoegsberg).
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/fbdev.c:
- Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
-
-2006-01-09 David Nusinow <gravity-at-freedesktop-dot-org>
-
- * man/fbdev.man:
- Convert manpage to utf-8
- Bugzilla #1925 <https://bugs.freedesktop.org/show_bug.cgi?id=1925>
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * 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 f76cca0..1622751 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
@@ -85,9 +91,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=fbdev
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile