diff options
author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /X11/extensions/Makefile.am | |
parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/Makefile.am')
-rw-r--r-- | X11/extensions/Makefile.am | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/X11/extensions/Makefile.am b/X11/extensions/Makefile.am index 8cdd0ac97..bbe5dd42e 100644 --- a/X11/extensions/Makefile.am +++ b/X11/extensions/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=specs + xextdir = $(includedir)/X11/extensions xext_HEADERS = \ dpmsconst.h \ @@ -31,17 +33,27 @@ xext_HEADERS = \ xtestconst.h \ xtestproto.h +# +# These headers allow old servers to be built with +# new headers +# +compatdir = $(xextdir) +compat_HEADERS = \ + shapestr.h \ + shmstr.h \ + syncstr.h + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xextproto.pc -EXTRA_DIST = xextproto.pc.in geproto.txt +MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL |