From db91ec37ea274f69eb5d07c41bef787d5e9537a5 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 26 Oct 2009 12:54:20 -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 | 25 ------------------------- Makefile.am | 6 ++++++ configure.ac | 9 ++++++--- 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 467041b..0000000 --- a/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -2006-04-06 Adam Jackson - - * configure.ac: - * src/vmmouse.c: - * src/vmmouse_proto.h: - Unlibcwrap. Bump server version requirement. Bump to 12.4.0. - -2006-03-28 Philip Langdale - - * configure.ac: - * src/vmmouse.c: Bump PATCHLEVEL. - * src/vmmouse_proto.h: Use the right #define - when detecting a 64bit compilation. This fixes - the driver to actually work for 64bit builds. - -2006-01-16 Philip Langdale - - * configure.ac: - * src/vmmouse.c: Bump PATCHLEVEL. - * src/vmmouse_proto.c: push/pop ebx to keep - gcc4 happy when compiling with -fPIC. - -2006-01-06 Philip Langdale - - * Initial release. diff --git a/Makefile.am b/Makefile.am index 2e7b369..6c4d773 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,9 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = shared src tools fdi man +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index a7ecda9..d4c94e2 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,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 + DRIVER_NAME=vmmouse AC_SUBST([DRIVER_NAME]) @@ -127,7 +133,4 @@ AC_SUBST([CFLAGS]) # Checks for header files. AC_HEADER_STDC -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile]) -- cgit v1.2.3