meson: Distribute more SDK headers
Install missing headers to the SDK directory to allow external modules to properly build against the SDK. After this commit, the list of files installed in the SDK include directory is the same as the list of files installed by the autotools-based build. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
parent
f3b0a2aee2
commit
88c7b8bf4b
|
@ -8,12 +8,19 @@ srcs_xext = [
|
||||||
'xtest.c',
|
'xtest.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_xext = [
|
||||||
|
'geext.h',
|
||||||
|
'geint.h',
|
||||||
|
'syncsdk.h',
|
||||||
|
]
|
||||||
|
|
||||||
if build_dpms
|
if build_dpms
|
||||||
srcs_xext += 'dpms.c'
|
srcs_xext += 'dpms.c'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if build_mitshm
|
if build_mitshm
|
||||||
srcs_xext += 'shm.c'
|
srcs_xext += 'shm.c'
|
||||||
|
hdrs_xext += ['shmint.h']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if build_res
|
if build_res
|
||||||
|
@ -26,6 +33,7 @@ endif
|
||||||
|
|
||||||
if build_xace
|
if build_xace
|
||||||
srcs_xext += 'xace.c'
|
srcs_xext += 'xace.c'
|
||||||
|
hdrs_xext += ['xace.h', 'xacestr.h']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if build_xf86bigfont
|
if build_xf86bigfont
|
||||||
|
@ -34,6 +42,7 @@ endif
|
||||||
|
|
||||||
if build_xinerama
|
if build_xinerama
|
||||||
srcs_xext += ['panoramiX.c', 'panoramiXprocs.c', 'panoramiXSwap.c']
|
srcs_xext += ['panoramiX.c', 'panoramiXprocs.c', 'panoramiXSwap.c']
|
||||||
|
hdrs_xext += ['panoramiX.h', 'panoramiXsrv.h']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if build_xsecurity
|
if build_xsecurity
|
||||||
|
@ -46,6 +55,7 @@ endif
|
||||||
|
|
||||||
if build_xv
|
if build_xv
|
||||||
srcs_xext += ['xvmain.c', 'xvdisp.c', 'xvmc.c']
|
srcs_xext += ['xvmain.c', 'xvdisp.c', 'xvmc.c']
|
||||||
|
hdrs_xext += ['xvdix.h', 'xvmcext.h']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libxserver_xext = static_library('libxserver_xext',
|
libxserver_xext = static_library('libxserver_xext',
|
||||||
|
@ -59,3 +69,5 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_xext, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -6,8 +6,14 @@ srcs_composite = [
|
||||||
'compwindow.c',
|
'compwindow.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_composite = [
|
||||||
|
'compositeext.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_composite = static_library('libxserver_composite',
|
libxserver_composite = static_library('libxserver_composite',
|
||||||
srcs_composite,
|
srcs_composite,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_composite, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -3,8 +3,14 @@ srcs_dbe = [
|
||||||
'midbe.c',
|
'midbe.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_dbe = [
|
||||||
|
'dbestruct.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_dbe = static_library('libxserver_dbe',
|
libxserver_dbe = static_library('libxserver_dbe',
|
||||||
srcs_dbe,
|
srcs_dbe,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_dbe, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -4,6 +4,10 @@ srcs_dri3 = [
|
||||||
'dri3_screen.c',
|
'dri3_screen.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_dri3 = [
|
||||||
|
'dri3.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_dri3 = []
|
libxserver_dri3 = []
|
||||||
if build_dri3
|
if build_dri3
|
||||||
libxserver_dri3 = static_library('libxserver_dri3',
|
libxserver_dri3 = static_library('libxserver_dri3',
|
||||||
|
@ -13,3 +17,5 @@ if build_dri3
|
||||||
c_args: '-DHAVE_XORG_CONFIG_H'
|
c_args: '-DHAVE_XORG_CONFIG_H'
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
install_data(hdrs_dri3, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -28,6 +28,14 @@ srcs_fb = [
|
||||||
'fbwindow.c',
|
'fbwindow.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_fb = [
|
||||||
|
'fb.h',
|
||||||
|
'fboverlay.h',
|
||||||
|
'fbpict.h',
|
||||||
|
'fbrop.h',
|
||||||
|
'wfbrename.h'
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_fb = static_library('libxserver_fb',
|
libxserver_fb = static_library('libxserver_fb',
|
||||||
srcs_fb,
|
srcs_fb,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
|
@ -45,3 +53,5 @@ libxserver_wfb = static_library('libxserver_wfb',
|
||||||
pic: true,
|
pic: true,
|
||||||
build_by_default: false,
|
build_by_default: false,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_fb, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -61,6 +61,10 @@ srcs_vnd = [
|
||||||
'vndservervendor.c',
|
'vndservervendor.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_vnd = [
|
||||||
|
'vndserver.h',
|
||||||
|
]
|
||||||
|
|
||||||
libglxvnd = ''
|
libglxvnd = ''
|
||||||
if build_glx
|
if build_glx
|
||||||
libglxvnd = static_library('libglxvnd',
|
libglxvnd = static_library('libglxvnd',
|
||||||
|
@ -73,4 +77,6 @@ if build_glx
|
||||||
dependency('gl', version: '>= 9.2.0'),
|
dependency('gl', version: '>= 9.2.0'),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_vnd, install_dir : xorgsdkdir)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -4,6 +4,13 @@ srcs_xorg_os_support = [
|
||||||
'shared/sigio.c',
|
'shared/sigio.c',
|
||||||
'shared/vidmem.c',
|
'shared/vidmem.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_xorg_os_support = [
|
||||||
|
'bus/xf86Pci.h',
|
||||||
|
'xf86_OSlib.h',
|
||||||
|
'xf86_OSproc.h'
|
||||||
|
]
|
||||||
|
|
||||||
os_support_flags = ['-DUSESTDRES']
|
os_support_flags = ['-DUSESTDRES']
|
||||||
|
|
||||||
if get_option('pciaccess')
|
if get_option('pciaccess')
|
||||||
|
@ -135,4 +142,4 @@ xorg_os_support = static_library('xorg_os_support',
|
||||||
c_args: xorg_c_args,
|
c_args: xorg_c_args,
|
||||||
)
|
)
|
||||||
|
|
||||||
install_data('bus/xf86Pci.h', install_dir: xorgsdkdir)
|
install_data(hdrs_xorg_os_support, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -423,6 +423,7 @@ if build_xorg
|
||||||
'xkbsrv.h',
|
'xkbsrv.h',
|
||||||
'xkbstr.h',
|
'xkbstr.h',
|
||||||
'xkbrules.h',
|
'xkbrules.h',
|
||||||
|
'Xprintf.h',
|
||||||
'xserver_poll.h',
|
'xserver_poll.h',
|
||||||
'xserver-properties.h',
|
'xserver-properties.h',
|
||||||
],
|
],
|
||||||
|
|
|
@ -29,6 +29,19 @@ srcs_mi = [
|
||||||
'mizerline.c',
|
'mizerline.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_mi = [
|
||||||
|
'micmap.h',
|
||||||
|
'micoord.h',
|
||||||
|
'migc.h',
|
||||||
|
'mi.h',
|
||||||
|
'miline.h',
|
||||||
|
'mioverlay.h',
|
||||||
|
'mipointer.h',
|
||||||
|
'mipointrst.h',
|
||||||
|
'mistruct.h',
|
||||||
|
'mizerarc.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_mi = static_library('libxserver_mi',
|
libxserver_mi = static_library('libxserver_mi',
|
||||||
srcs_mi,
|
srcs_mi,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
|
@ -37,3 +50,5 @@ libxserver_mi = static_library('libxserver_mi',
|
||||||
m_dep,
|
m_dep,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_mi, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -2,8 +2,15 @@ srcs_miext_damage = [
|
||||||
'damage.c',
|
'damage.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_miext_damage = [
|
||||||
|
'damage.h',
|
||||||
|
'damagestr.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_miext_damage = static_library('libxserver_miext_damage',
|
libxserver_miext_damage = static_library('libxserver_miext_damage',
|
||||||
srcs_miext_damage,
|
srcs_miext_damage,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -25,8 +25,14 @@ srcs_miext_shadow = [
|
||||||
'shrotate.c',
|
'shrotate.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_miext_shadow = [
|
||||||
|
'shadow.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_miext_shadow = static_library('libxserver_miext_shadow',
|
libxserver_miext_shadow = static_library('libxserver_miext_shadow',
|
||||||
srcs_miext_shadow,
|
srcs_miext_shadow,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -3,6 +3,13 @@ srcs_miext_sync = [
|
||||||
'misyncfd.c',
|
'misyncfd.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_miext_sync = [
|
||||||
|
'misync.h',
|
||||||
|
'misyncfd.h',
|
||||||
|
'misyncshm.h',
|
||||||
|
'misyncstr.h',
|
||||||
|
]
|
||||||
|
|
||||||
if build_dri3
|
if build_dri3
|
||||||
srcs_miext_sync += 'misyncshm.c'
|
srcs_miext_sync += 'misyncshm.c'
|
||||||
endif
|
endif
|
||||||
|
@ -15,3 +22,5 @@ libxserver_miext_sync = static_library('libxserver_miext_sync',
|
||||||
xshmfence_dep,
|
xshmfence_dep,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -12,6 +12,11 @@ srcs_present = [
|
||||||
'present_wnmd.c',
|
'present_wnmd.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_present = [
|
||||||
|
'present.h',
|
||||||
|
'presentext.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_present = static_library('libxserver_present',
|
libxserver_present = static_library('libxserver_present',
|
||||||
srcs_present,
|
srcs_present,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
|
@ -21,3 +26,5 @@ libxserver_present = static_library('libxserver_present',
|
||||||
],
|
],
|
||||||
c_args: '-DHAVE_XORG_CONFIG_H'
|
c_args: '-DHAVE_XORG_CONFIG_H'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_present, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -16,6 +16,11 @@ srcs_randr = [
|
||||||
'rrtransform.c',
|
'rrtransform.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_randr = [
|
||||||
|
'randrstr.h',
|
||||||
|
'rrtransform.h',
|
||||||
|
]
|
||||||
|
|
||||||
if build_xinerama
|
if build_xinerama
|
||||||
srcs_randr += 'rrxinerama.c'
|
srcs_randr += 'rrxinerama.c'
|
||||||
endif
|
endif
|
||||||
|
@ -25,3 +30,5 @@ libxserver_randr = static_library('libxserver_randr',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_randr, install_dir: xorgsdkdir)
|
||||||
|
|
|
@ -12,8 +12,17 @@ srcs_render = [
|
||||||
'render.c',
|
'render.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
hdrs_render = [
|
||||||
|
'glyphstr.h',
|
||||||
|
'mipict.h',
|
||||||
|
'picture.h',
|
||||||
|
'picturestr.h',
|
||||||
|
]
|
||||||
|
|
||||||
libxserver_render = static_library('libxserver_render',
|
libxserver_render = static_library('libxserver_render',
|
||||||
srcs_render,
|
srcs_render,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: common_dep,
|
dependencies: common_dep,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install_data(hdrs_render, install_dir: xorgsdkdir)
|
||||||
|
|
Loading…
Reference in New Issue