qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to disable applewm and windowswm protos

Browse Source 
(not used on OpenBSD) and mark some more protos as legacy.
This commit is contained in:
matthieu 2019-01-30 20:49:44 +00:00
parent 6317fbc72d
commit 7eab099a22
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proto/xorgproto/Makefile.am
View File

@ -1,3 +1,4 @@
if APPLEWM
applewmdir = $(includedir)/X11/extensions applewmdir = $(includedir)/X11/extensions
applewm_HEADERS = \ applewm_HEADERS = \
include/X11/extensions/applewmconst.h \ include/X11/extensions/applewmconst.h \
@ -5,6 +6,7 @@ applewm_HEADERS = \
applewmprotopkgconfigdir = $(datadir)/pkgconfig applewmprotopkgconfigdir = $(datadir)/pkgconfig
applewmprotopkgconfig_DATA = applewmproto.pc applewmprotopkgconfig_DATA = applewmproto.pc
endif
bigreqsdir = $(includedir)/X11/extensions bigreqsdir = $(includedir)/X11/extensions
bigreqs_HEADERS = \ bigreqs_HEADERS = \
@ -156,7 +158,6 @@ lg3dprotopkgconfigdir = $(datadir)/pkgconfig
lg3dprotopkgconfig_DATA = lg3dproto.pc lg3dprotopkgconfig_DATA = lg3dproto.pc
lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in
endif
xproxymngdir = $(includedir)/X11/PM xproxymngdir = $(includedir)/X11/PM
xproxymng_HEADERS = \ xproxymng_HEADERS = \
@ -167,6 +168,7 @@ pmprotopkgconfigdir = $(datadir)/pkgconfig
pmprotopkgconfig_DATA = xproxymngproto.pc pmprotopkgconfig_DATA = xproxymngproto.pc
pmproto_EXTRA_DIST = xproxymngproto.pc.in pmproto_EXTRA_DIST = xproxymngproto.pc.in
endif
presentdir = $(includedir)/X11/extensions presentdir = $(includedir)/X11/extensions
present_HEADERS = \ present_HEADERS = \
@ -261,6 +263,7 @@ scrnsaver_HEADERS = \
scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig
scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc
if LEGACY
trapdir = $(includedir)/X11/extensions trapdir = $(includedir)/X11/extensions
trap_HEADERS = \ trap_HEADERS = \
include/X11/extensions/xtrapbits.h \ include/X11/extensions/xtrapbits.h \
@ -275,6 +278,7 @@ trapprotopkgconfigdir = $(datadir)/pkgconfig
trapprotopkgconfig_DATA = trapproto.pc trapprotopkgconfig_DATA = trapproto.pc
trapproto_EXTRA_DIST = trapproto.pc.in trapproto_EXTRA_DIST = trapproto.pc.in
endif
videodir = $(includedir)/X11/extensions videodir = $(includedir)/X11/extensions
video_HEADERS = \ video_HEADERS = \
@ -287,6 +291,7 @@ video_HEADERS = \
videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfigdir = $(datadir)/pkgconfig
videoprotopkgconfig_DATA = videoproto.pc videoprotopkgconfig_DATA = videoproto.pc
if WINDOWSWM
windowswmdir = $(includedir)/X11/extensions windowswmdir = $(includedir)/X11/extensions
windowswm_HEADERS = \ windowswm_HEADERS = \
include/X11/extensions/windowswm.h \ include/X11/extensions/windowswm.h \
@ -294,6 +299,7 @@ windowswm_HEADERS = \
windowswmprotopkgconfigdir = $(datadir)/pkgconfig windowswmprotopkgconfigdir = $(datadir)/pkgconfig
windowswmprotopkgconfig_DATA = windowswmproto.pc windowswmprotopkgconfig_DATA = windowswmproto.pc
endif
xprotodir = $(includedir)/X11 xprotodir = $(includedir)/X11
xproto_HEADERS = \ xproto_HEADERS = \
@ -370,11 +376,13 @@ xext_HEADERS = \
include/X11/extensions/xtestconst.h \ include/X11/extensions/xtestconst.h \
include/X11/extensions/xtestproto.h include/X11/extensions/xtestproto.h
if LEGACY
compatdir = $(xextdir) compatdir = $(xextdir)
compat_HEADERS = \ compat_HEADERS = \
include/X11/extensions/shapestr.h \ include/X11/extensions/shapestr.h \
include/X11/extensions/shmstr.h \ include/X11/extensions/shmstr.h \
include/X11/extensions/syncstr.h include/X11/extensions/syncstr.h
endif
xextprotopkgconfigdir = $(datadir)/pkgconfig xextprotopkgconfigdir = $(datadir)/pkgconfig
xextprotopkgconfig_DATA = xextproto.pc xextprotopkgconfig_DATA = xextproto.pc
@ -410,6 +418,7 @@ xf86dri_HEADERS = \
xf86driprotopkgconfigdir = $(datadir)/pkgconfig xf86driprotopkgconfigdir = $(datadir)/pkgconfig
xf86driprotopkgconfig_DATA = xf86driproto.pc xf86driprotopkgconfig_DATA = xf86driproto.pc
if LEGACY
xf86miscdir = $(includedir)/X11/extensions xf86miscdir = $(includedir)/X11/extensions
xf86misc_HEADERS = \ xf86misc_HEADERS = \
include/X11/extensions/xf86misc.h \ include/X11/extensions/xf86misc.h \
@ -420,7 +429,6 @@ xf86miscprotopkgconfig_DATA = xf86miscproto.pc
xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in
if LEGACY
xf86rushdir = $(includedir)/X11/extensions xf86rushdir = $(includedir)/X11/extensions
xf86rush_HEADERS = \ xf86rush_HEADERS = \
include/X11/extensions/xf86rush.h \ include/X11/extensions/xf86rush.h \

12
proto/xorgproto/configure.ac
View File

@ -45,6 +45,18 @@ AC_ARG_ENABLE(legacy,
[LEGACY=$enableval], [LEGACY=no]) [LEGACY=$enableval], [LEGACY=no])
AM_CONDITIONAL(LEGACY, [test "x$LEGACY" = "xyes"]) AM_CONDITIONAL(LEGACY, [test "x$LEGACY" = "xyes"])
AC_ARG_ENABLE(applewm,
AS_HELP_STRING([--enable-applewm],
[Install apple wm protocol headers (default: false)]),
[APPLEWM=$enableval], [APPLEWM=no])
AM_CONDITIONAL(APPLEWM, [test "x$APPLEWM" = "xyes"])
AC_ARG_ENABLE(windowswm,
AS_HELP_STRING([--enable-windowswm],
[Install windows wm protocol headers (default: false)]),
[WINDOWSWM=$enableval], [WINDOWSWM=no])
AM_CONDITIONAL(WINDOWSWM, [test "x$WINDOWSWM" = "xyes"])
AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h]) AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
# Handle Xpoll.h.in # Handle Xpoll.h.in