.gitignore | 14 ++++++++++++++ Makefile.am | 13 ++++++++++++- configure.ac | 6 +++++- 3 files changed, 31 insertions(+), 2 deletions(-)
New commits: commit a223ab5e6a215d86e4bf072369b331506f689f83 Author: Kristian Høgsberg <[email protected]> Date: Mon Apr 20 14:08:19 2009 -0400 Bump to 2.0 and release diff --git a/configure.ac b/configure.ac index 2986a26..234426c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([DRI2Proto], [1.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([DRI2Proto], [2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit f46b6ca29b2da54cf6e6db57d464bea9476594c6 Author: Julien Cristau <[email protected]> Date: Fri Jan 9 06:07:59 2009 +0100 Distribute the protocol documentation diff --git a/Makefile.am b/Makefile.am index 1d72a35..d26a4a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ dri2_HEADERS = dri2proto.h dri2tokens.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dri2proto.pc -EXTRA_DIST = dri2proto.pc.in +EXTRA_DIST = dri2proto.pc.in dri2proto.txt EXTRA_DIST += ChangeLog commit ac787752bf67f8f1ea8167191e5fb9d7fbbe7c7f Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12c40fc --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +Makefile +Makefile.in +aclocal.m4 +dri2proto.pc +autom4te.cache +config.log +config.status +configure +install-sh +missing +*~ +dri2proto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 64f26a5..1d72a35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,15 @@ dri2_HEADERS = dri2proto.h dri2tokens.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dri2proto.pc -EXTRA_DIST = autogen.sh dri2proto.pc.in +EXTRA_DIST = dri2proto.pc.in + +EXTRA_DIST += ChangeLog + +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index e68ec63..2986a26 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([DRI2Proto], [1.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: 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) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile dri2proto.pc]) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
