summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-09-13 16:43:21 -0400
committerAdam Jackson <ajax@redhat.com>2019-10-08 14:58:32 -0400
commit1547c1cc3c99cca7c123ee83aee66586477bf265 (patch)
tree5833ea7e85227b63c7d9bff7d469218561b089ae /Makefile.am
parente0d4e02710e6d66408ecbbd2fee64ae4c6748739 (diff)
Move remaining xlib-entwined headers to LEGACY
These headers refer to libX11 types and don't belong in this package. libX11 and libXv have been updated to supply these headers themselves now, so these are only useful for building older versions of those libraries. Fixes: xorg/proto/xorgproto#10
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 40c2f67..18f4203 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,11 +130,13 @@ inputprotopkgconfig_DATA = inputproto.pc
kbdir = $(includedir)/X11/extensions
kb_HEADERS = \
- include/X11/extensions/XKBgeom.h \
include/X11/extensions/XKB.h \
include/X11/extensions/XKBproto.h \
include/X11/extensions/XKBsrv.h \
include/X11/extensions/XKBstr.h
+if LEGACY
+kb_HEADERS += include/X11/extensions/XKBgeom.h
+endif
kbprotopkgconfigdir = $(datadir)/pkgconfig
kbprotopkgconfig_DATA = kbproto.pc
@@ -256,11 +258,13 @@ endif
videodir = $(includedir)/X11/extensions
video_HEADERS = \
- include/X11/extensions/vldXvMC.h \
include/X11/extensions/Xv.h \
include/X11/extensions/XvMC.h \
include/X11/extensions/XvMCproto.h \
include/X11/extensions/Xvproto.h
+if LEGACY
+video_HEADERS += include/X11/extensions/vldXvMC.h
+endif
videoprotopkgconfigdir = $(datadir)/pkgconfig
videoprotopkgconfig_DATA = videoproto.pc