diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 17:22:14 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 17:22:14 +0930 |
| commit | 9dc48efe2b3136756613ae00afd706f9a52d6f10 (patch) | |
| tree | fbedf95876c5e0adf13a01b4eeb9e259ddf67102 | |
| parent | 69356e4165f11f3ed4b377d29df038549191a91e (diff) | |
| parent | a07a30f9922e9768e2cf00cc2e479978242c58a8 (diff) | |
| download | xorg-proto-xextproto-9dc48efe2b3136756613ae00afd706f9a52d6f10.tar.gz | |
Merge branch 'master' into xge
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | Makefile.am | 10 |
3 files changed, 11 insertions, 19 deletions
@@ -8,3 +8,4 @@ configure install-sh missing xextproto.pc +*~ diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index ef3ad1f..0000000 --- a/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2006-06-27 Alan Coopersmith <alan.coopersmith@sun.com> - - * Makefile.am: - * Xagsrv.h [REMOVED]: - Remove Xserver API for appgroup extension - [Will break Xorg server builds prior to 2006-06-21 / git commit - 77c947b900faf34f425eef1549d8210c475e093b] - -2006-06-20 Alan Coopersmith <alan.coopersmith@sun.com> - - * security.h: - Remove Xserver API for security extension (#ifdef _SECURITY_SERVER) - [Will break Xorg server builds prior to 2006-06-20 / git commit - d44b2a0a57fb89741173c31676af0ccc822387dc] - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 2fa1920..fe47e25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,3 +43,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xextproto.pc EXTRA_DIST = autogen.sh xextproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog |