On 02/27/2012 08:04 AM, Gaetan Nadon wrote:
Use the util-macros implementation to generate the ChangeLog and the INSTALL file.Signed-off-by: Gaetan Nadon<mems...@videotron.ca> --- Makefile.am | 6 +++--- configure.ac | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 ChangeLog delete mode 100644 Changelog delete mode 100644 INSTALL diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/Changelog b/Changelog deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index a3f51a3..19598ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,11 +5,11 @@ pkgconfig_DATA = xorg-gtest.pc ACLOCAL_AMFLAGS = -I m4 +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL ChangeLog: - cd ${top_srcdir}&& \ - mkdir -p ${distdir}&& \ - git log> ${distdir}/ChangeLog + $(CHANGELOG_CMD) INSTALL: $(INSTALL_CMD) diff --git a/configure.ac b/configure.ac index 807dbce..f5b0cea 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,12 @@ AC_PROG_LIBTOOL LT_INIT +# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.16) +XORG_DEFAULT_OPTIONS + # Checks for programs. AC_PROG_CXX AC_PROG_INSTALL
Looks good to me. Applied and pushed. Thanks! -- Chase _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
