diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2007-09-12 17:43:33 +0100 |
|---|---|---|
| committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2007-09-12 17:43:33 +0100 |
| commit | c13e2a941d77520e27233577845e77620b17e0ea (patch) | |
| tree | e55fe683c58d7252b6c4ff81e4414c25aa9ba74b /Makefile.am | |
| parent | 6728f372d6ef9d3867da1d417723de91f22ef901 (diff) | |
| parent | 257c8ed17f4f908e0d0d5e53aaf13aa3b1313f50 (diff) | |
Merge branch 'master' into glucose-2
Conflicts:
fb/fb.h
fb/fbcompose.c
fb/fbmmx.c
fb/fbmmx.h
fb/fbpict.c
fb/fbtile.c
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
hw/xgl/xglcompose.c
render/picture.c
render/picture.h
render/picturestr.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d1077b00b..b1daa056b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,17 @@ aclocal_DATA = xorg-server.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 +EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh + +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 DIST_SUBDIRS = \ doc \ |