meson: hide C API if Xorg is disabled (like autotools)
When building only Xwayland using Meson some files are always installed. This causes package conflict if Xwayland is built separately from Xorg. include/xorg/compositeext.h include/xorg/damage.h include/xorg/damagestr.h include/xorg/dbestruct.h include/xorg/dri3.h include/xorg/fb.h include/xorg/fboverlay.h include/xorg/fbpict.h include/xorg/fbrop.h include/xorg/geext.h include/xorg/geint.h include/xorg/glyphstr.h include/xorg/mi.h include/xorg/micmap.h include/xorg/micoord.h include/xorg/migc.h include/xorg/miline.h include/xorg/mioverlay.h include/xorg/mipict.h include/xorg/mipointer.h include/xorg/mipointrst.h include/xorg/mistruct.h include/xorg/misync.h include/xorg/misyncfd.h include/xorg/misyncshm.h include/xorg/misyncstr.h include/xorg/mizerarc.h include/xorg/panoramiX.h include/xorg/panoramiXsrv.h include/xorg/picture.h include/xorg/picturestr.h include/xorg/present.h include/xorg/presentext.h include/xorg/randrstr.h include/xorg/rrtransform.h include/xorg/shadow.h include/xorg/shmint.h include/xorg/syncsdk.h include/xorg/vndserver.h include/xorg/wfbrename.h include/xorg/xace.h include/xorg/xacestr.h include/xorg/xorg-server.h include/xorg/xvdix.h include/xorg/xvmcext.h share/aclocal/xorg-server.m4 Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
parent
4ae36f418e
commit
376eaadde3
|
@ -74,4 +74,6 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_xext, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_xext, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -16,4 +16,6 @@ libxserver_composite = static_library('libxserver_composite',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_composite, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_composite, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -13,4 +13,6 @@ libxserver_dbe = static_library('libxserver_dbe',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_dbe, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_dbe, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -17,4 +17,6 @@ if build_dri3
|
|||
)
|
||||
endif
|
||||
|
||||
install_data(hdrs_dri3, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_dri3, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -54,4 +54,6 @@ libxserver_wfb = static_library('libxserver_wfb',
|
|||
build_by_default: false,
|
||||
)
|
||||
|
||||
install_data(hdrs_fb, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_fb, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -79,5 +79,7 @@ if build_glx
|
|||
],
|
||||
)
|
||||
|
||||
install_data(hdrs_vnd, install_dir : xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_vnd, install_dir : xorgsdkdir)
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -318,6 +318,7 @@ configure_file(output : 'dix-config.h',
|
|||
configure_file(output : 'xorg-server.h',
|
||||
input : 'xorg-server.h.meson.in',
|
||||
configuration : conf_data,
|
||||
install: build_xorg,
|
||||
install_dir: xorgsdkdir)
|
||||
|
||||
version_data = configuration_data()
|
||||
|
|
|
@ -819,7 +819,7 @@ if build_xorg
|
|||
get_option('libdir'),
|
||||
'pkgconfig'),
|
||||
)
|
||||
endif
|
||||
|
||||
install_data('xorg-server.m4',
|
||||
install_dir: join_paths(get_option('datadir'), 'aclocal'))
|
||||
install_data('xorg-server.m4',
|
||||
install_dir: join_paths(get_option('datadir'), 'aclocal'))
|
||||
endif
|
||||
|
|
|
@ -51,4 +51,6 @@ libxserver_mi = static_library('libxserver_mi',
|
|||
],
|
||||
)
|
||||
|
||||
install_data(hdrs_mi, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_mi, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -13,4 +13,6 @@ libxserver_miext_damage = static_library('libxserver_miext_damage',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -35,4 +35,6 @@ libxserver_miext_shadow = static_library('libxserver_miext_shadow',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -23,4 +23,6 @@ libxserver_miext_sync = static_library('libxserver_miext_sync',
|
|||
],
|
||||
)
|
||||
|
||||
install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -26,4 +26,6 @@ libxserver_present = static_library('libxserver_present',
|
|||
],
|
||||
)
|
||||
|
||||
install_data(hdrs_present, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_present, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -31,4 +31,6 @@ libxserver_randr = static_library('libxserver_randr',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_randr, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_randr, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
|
@ -25,4 +25,6 @@ libxserver_render = static_library('libxserver_render',
|
|||
dependencies: common_dep,
|
||||
)
|
||||
|
||||
install_data(hdrs_render, install_dir: xorgsdkdir)
|
||||
if build_xorg
|
||||
install_data(hdrs_render, install_dir: xorgsdkdir)
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue