diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/Makefile.am | |
parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/Makefile.am')
-rw-r--r-- | libX11/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libX11/Makefile.am b/libX11/Makefile.am index 944aaa0cb..4fcad1c19 100644 --- a/libX11/Makefile.am +++ b/libX11/Makefile.am @@ -11,14 +11,15 @@ if XCB pkgconfig_DATA += x11-xcb.pc endif -EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog autogen.sh +EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog MAINTAINERCLEANFILES=ChangeLog +DISTCLEANFILES = doltcompile doltlibtool .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) + $(CHANGELOG_CMD) dist-hook: ChangeLog |