diff options
author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /libXau/Makefile.am | |
parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'libXau/Makefile.am')
-rw-r--r-- | libXau/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libXau/Makefile.am b/libXau/Makefile.am index 635fdb97d..01e24149d 100644 --- a/libXau/Makefile.am +++ b/libXau/Makefile.am @@ -18,10 +18,6 @@ libXau_la_SOURCES = \ AuUnlock.c \ AuWrite.c -if KERBEROS -libXau_la_SOURCES +=k5encode.c -endif KERBEROS - xauincludedir=$(includedir)/X11 xauinclude_HEADERS = include/X11/Xauth.h @@ -87,6 +83,6 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man .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 |