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 /X11/extensions/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 'X11/extensions/Makefile.am')
-rw-r--r-- | X11/extensions/Makefile.am | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/X11/extensions/Makefile.am b/X11/extensions/Makefile.am index fe47e2578..8cdd0ac97 100644 --- a/X11/extensions/Makefile.am +++ b/X11/extensions/Makefile.am @@ -1,48 +1,40 @@ xextdir = $(includedir)/X11/extensions xext_HEADERS = \ - dpms.h \ - dpmsstr.h \ - extutil.h \ + dpmsconst.h \ + dpmsproto.h \ ge.h \ geproto.h \ - Xge.h \ - lbxbuf.h \ - lbxbufstr.h \ - lbxdeltastr.h \ - lbximage.h \ - lbxopts.h \ - lbxstr.h \ - lbxzlib.h \ - MITMisc.h \ - mitmiscstr.h \ - multibuf.h \ - multibufst.h \ - security.h \ - securstr.h \ - shape.h \ - shapestr.h \ - shmstr.h \ - sync.h \ - syncstr.h \ - Xag.h \ - Xagstr.h \ - Xcup.h \ - Xcupstr.h \ - Xdbe.h \ - Xdbeproto.h \ - XEVI.h \ - XEVIstr.h \ - Xext.h \ - XLbx.h \ - XShm.h \ - xtestext1.h \ - XTest.h \ - xteststr.h + lbx.h \ + lbxproto.h \ + mitmiscconst.h \ + mitmiscproto.h \ + multibufconst.h \ + multibufproto.h \ + secur.h \ + securproto.h \ + shapeconst.h \ + shapeproto.h \ + shm.h \ + shmproto.h \ + syncconst.h \ + syncproto.h \ + ag.h \ + agproto.h \ + cup.h \ + cupproto.h \ + dbe.h \ + dbeproto.h \ + EVI.h \ + EVIproto.h \ + xtestext1proto.h \ + xtestext1const.h \ + xtestconst.h \ + xtestproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xextproto.pc -EXTRA_DIST = autogen.sh xextproto.pc.in +EXTRA_DIST = xextproto.pc.in geproto.txt EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -50,6 +42,6 @@ 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) + $(CHANGELOG_CMD) dist-hook: ChangeLog |