diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2017-06-26 14:54:05 +0100 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2017-06-27 12:42:35 -0400 |
commit | b34abb3d2da46339d59a0feefd2240790a6a6a0e (patch) | |
tree | 9c0e799049f9e042daa141a90f8078e82ac90269 | |
parent | fbdd73fac68383c93f6f5c6a7615860503039999 (diff) |
meson: Shuffle around subdirs so we build Xorg loadable modules after Xorg
Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | hw/xfree86/meson.build | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build index ee872de9b..0975104c2 100644 --- a/hw/xfree86/meson.build +++ b/hw/xfree86/meson.build @@ -23,44 +23,22 @@ if get_option('pciaccess') pciaccess_dep = dependency('pciaccess', version: '>= 0.12.901') endif +# subdirs for convenience libraries statically linked into Xorg subdir('common') subdir('ddc') -subdir('dixmods') -subdir('exa') -subdir('fbdevhw') -if gbm_dep.found() - subdir('glamor_egl') -endif -subdir('i2c') if build_dri1 subdir('dri') endif if build_dri2 subdir('dri2') endif - -if int10 != 'disabled' - if int10 == 'x86emu' - subdir('x86emu') - endif - subdir('int10') -endif +subdir('i2c') subdir('loader') subdir('modes') subdir('os-support') subdir('parser') subdir('ramdac') -subdir('shadowfb') -if build_vbe - subdir('vbe') -endif -if build_vgahw - subdir('vgahw') -endif subdir('xkb') -if build_modesetting - subdir('drivers/modesetting') -endif srcs_xorg = [ '../../mi/miinitext.c' @@ -118,6 +96,30 @@ executable( 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 xorgserver_lib = shared_library( 'xorgserver', |