From 1547c1cc3c99cca7c123ee83aee66586477bf265 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 13 Sep 2019 16:43:21 -0400 Subject: 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 --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile.am') 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 -- cgit v1.2.3