From fbdd73fac68383c93f6f5c6a7615860503039999 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 26 Jun 2017 14:54:04 +0100 Subject: [PATCH] Move statically linked xorgxkb files from dixmods to a separate directory [ajax: Fixed test/Makefile.am as well] Reviewed-by: Adam Jackson --- configure.ac | 1 + hw/xfree86/Makefile.am | 10 +++++----- hw/xfree86/dixmods/Makefile.am | 4 +--- hw/xfree86/dixmods/meson.build | 14 +------------- hw/xfree86/meson.build | 3 ++- hw/xfree86/xkb/Makefile.am | 6 ++++++ hw/xfree86/xkb/meson.build | 12 ++++++++++++ hw/xfree86/{dixmods => xkb}/xkbKillSrv.c | 0 hw/xfree86/{dixmods => xkb}/xkbPrivate.c | 0 hw/xfree86/{dixmods => xkb}/xkbVT.c | 0 test/Makefile.am | 2 +- 11 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 hw/xfree86/xkb/Makefile.am create mode 100644 hw/xfree86/xkb/meson.build rename hw/xfree86/{dixmods => xkb}/xkbKillSrv.c (100%) rename hw/xfree86/{dixmods => xkb}/xkbPrivate.c (100%) rename hw/xfree86/{dixmods => xkb}/xkbVT.c (100%) diff --git a/configure.ac b/configure.ac index 40ac1e78d..e202770c1 100644 --- a/configure.ac +++ b/configure.ac @@ -2497,6 +2497,7 @@ hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile +hw/xfree86/xkb/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/man/Makefile hw/xfree86/utils/cvt/Makefile diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 85bd0bed0..b876b79ab 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -36,13 +36,13 @@ endif SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ - $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods \ + $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ $(GLAMOR_EGL_SUBDIR) drivers DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ parser ramdac shadowfb vbe vgahw \ - loader dixmods dri dri2 exa modes \ + loader dixmods xkb dri dri2 exa modes \ utils doc man glamor_egl drivers bin_PROGRAMS = Xorg @@ -66,7 +66,7 @@ LOCAL_LIBS = \ ddc/libddc.la \ i2c/libi2c.la \ $(XORG_LIBS) \ - dixmods/libxorgxkb.la \ + xkb/libxorgxkb.la \ $(DRI_LIB) \ $(DRI2_LIB) \ $(DRI3_LIB) \ @@ -148,5 +148,5 @@ i2c/libi2c.la: dixmods/libdixmods.la: $(AM_V_at)cd dixmods && $(MAKE) libdixmods.la -dixmods/libxorgxkb.la: - $(AM_V_at)cd dixmods && $(MAKE) libxorgxkb.la +xkb/libxorgxkb.la: + $(AM_V_at)cd xkb && $(MAKE) libxorgxkb.la diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index d534c789b..856659f98 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la +noinst_LTLIBRARIES = libdixmods.la if GLX GLXMODS = libglx.la @@ -46,5 +46,3 @@ libshadow_la_SOURCES = shmodule.c libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libdixmods_la_CFLAGS = $(AM_CFLAGS) - -libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build index e4ffdba93..ffaf3ef86 100644 --- a/hw/xfree86/dixmods/meson.build +++ b/hw/xfree86/dixmods/meson.build @@ -1,16 +1,3 @@ -srcs_xorg_dixmods = [ - 'xkbVT.c', - 'xkbPrivate.c', - 'xkbKillSrv.c', -] - -xorg_dixmods = static_library('xorg_dixmods', - srcs_xorg_dixmods, - include_directories: [inc, xorg_inc], - dependencies: common_dep, - c_args: xorg_c_args, -) - shared_module( 'fb', 'fbmodule.c', @@ -36,6 +23,7 @@ shared_module( install: true, install_dir: module_dir, ) + shared_module( 'shadow', 'shmodule.c', diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build index 1df7313fe..ee872de9b 100644 --- a/hw/xfree86/meson.build +++ b/hw/xfree86/meson.build @@ -57,6 +57,7 @@ endif if build_vgahw subdir('vgahw') endif +subdir('xkb') if build_modesetting subdir('drivers/modesetting') endif @@ -75,7 +76,7 @@ xorg_link = [ xorg_common, xorg_loader, xorg_ddc, - xorg_dixmods, + xorg_xkb, xorg_i2c, xorg_modes, xorg_os_support, diff --git a/hw/xfree86/xkb/Makefile.am b/hw/xfree86/xkb/Makefile.am new file mode 100644 index 000000000..252cf3b5d --- /dev/null +++ b/hw/xfree86/xkb/Makefile.am @@ -0,0 +1,6 @@ +noinst_LTLIBRARIES = libxorgxkb.la + +AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ +AM_CPPFLAGS = @XORG_INCS@ + +libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c diff --git a/hw/xfree86/xkb/meson.build b/hw/xfree86/xkb/meson.build new file mode 100644 index 000000000..894aa5ca3 --- /dev/null +++ b/hw/xfree86/xkb/meson.build @@ -0,0 +1,12 @@ +srcs_xorg_xkb = [ + 'xkbVT.c', + 'xkbPrivate.c', + 'xkbKillSrv.c', +] + +xorg_xkb = static_library('xorg_xkb', + srcs_xorg_xkb, + include_directories: [inc, xorg_inc], + dependencies: common_dep, + c_args: xorg_c_args, +) diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c similarity index 100% rename from hw/xfree86/dixmods/xkbKillSrv.c rename to hw/xfree86/xkb/xkbKillSrv.c diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c similarity index 100% rename from hw/xfree86/dixmods/xkbPrivate.c rename to hw/xfree86/xkb/xkbPrivate.c diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/xkb/xkbVT.c similarity index 100% rename from hw/xfree86/dixmods/xkbVT.c rename to hw/xfree86/xkb/xkbVT.c diff --git a/test/Makefile.am b/test/Makefile.am index b9c8fb36f..15f0b53f0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -144,7 +144,7 @@ tests_LDADD += \ $(top_builddir)/hw/xfree86/ramdac/libramdac.la \ $(top_builddir)/hw/xfree86/ddc/libddc.la \ $(top_builddir)/hw/xfree86/i2c/libi2c.la \ - $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ + $(top_builddir)/hw/xfree86/xkb/libxorgxkb.la \ $(top_builddir)/Xext/libXvidmode.la \ $(XSERVER_LIBS) \ $(XORG_LIBS)