meson: Shuffle around subdirs so we build Xorg loadable modules after Xorg
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
fbdd73fac6
commit
b34abb3d2d
|
@ -23,44 +23,22 @@ if get_option('pciaccess')
|
||||||
pciaccess_dep = dependency('pciaccess', version: '>= 0.12.901')
|
pciaccess_dep = dependency('pciaccess', version: '>= 0.12.901')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# subdirs for convenience libraries statically linked into Xorg
|
||||||
subdir('common')
|
subdir('common')
|
||||||
subdir('ddc')
|
subdir('ddc')
|
||||||
subdir('dixmods')
|
|
||||||
subdir('exa')
|
|
||||||
subdir('fbdevhw')
|
|
||||||
if gbm_dep.found()
|
|
||||||
subdir('glamor_egl')
|
|
||||||
endif
|
|
||||||
subdir('i2c')
|
|
||||||
if build_dri1
|
if build_dri1
|
||||||
subdir('dri')
|
subdir('dri')
|
||||||
endif
|
endif
|
||||||
if build_dri2
|
if build_dri2
|
||||||
subdir('dri2')
|
subdir('dri2')
|
||||||
endif
|
endif
|
||||||
|
subdir('i2c')
|
||||||
if int10 != 'disabled'
|
|
||||||
if int10 == 'x86emu'
|
|
||||||
subdir('x86emu')
|
|
||||||
endif
|
|
||||||
subdir('int10')
|
|
||||||
endif
|
|
||||||
subdir('loader')
|
subdir('loader')
|
||||||
subdir('modes')
|
subdir('modes')
|
||||||
subdir('os-support')
|
subdir('os-support')
|
||||||
subdir('parser')
|
subdir('parser')
|
||||||
subdir('ramdac')
|
subdir('ramdac')
|
||||||
subdir('shadowfb')
|
|
||||||
if build_vbe
|
|
||||||
subdir('vbe')
|
|
||||||
endif
|
|
||||||
if build_vgahw
|
|
||||||
subdir('vgahw')
|
|
||||||
endif
|
|
||||||
subdir('xkb')
|
subdir('xkb')
|
||||||
if build_modesetting
|
|
||||||
subdir('drivers/modesetting')
|
|
||||||
endif
|
|
||||||
|
|
||||||
srcs_xorg = [
|
srcs_xorg = [
|
||||||
'../../mi/miinitext.c'
|
'../../mi/miinitext.c'
|
||||||
|
@ -118,6 +96,30 @@ executable(
|
||||||
install: true,
|
install: true,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# subdirs for modules loadable by Xorg
|
||||||
|
subdir('dixmods')
|
||||||
|
subdir('exa')
|
||||||
|
subdir('fbdevhw')
|
||||||
|
if gbm_dep.found()
|
||||||
|
subdir('glamor_egl')
|
||||||
|
endif
|
||||||
|
if int10 != 'disabled'
|
||||||
|
if int10 == 'x86emu'
|
||||||
|
subdir('x86emu')
|
||||||
|
endif
|
||||||
|
subdir('int10')
|
||||||
|
endif
|
||||||
|
subdir('shadowfb')
|
||||||
|
if build_vbe
|
||||||
|
subdir('vbe')
|
||||||
|
endif
|
||||||
|
if build_vgahw
|
||||||
|
subdir('vgahw')
|
||||||
|
endif
|
||||||
|
if build_modesetting
|
||||||
|
subdir('drivers/modesetting')
|
||||||
|
endif
|
||||||
|
|
||||||
# For symbol presence testing only
|
# For symbol presence testing only
|
||||||
xorgserver_lib = shared_library(
|
xorgserver_lib = shared_library(
|
||||||
'xorgserver',
|
'xorgserver',
|
||||||
|
|
Loading…
Reference in New Issue