Move statically linked xorgxkb files from dixmods to a separate directory
[ajax: Fixed test/Makefile.am as well]
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit fbdd73fac6
)
This commit is contained in:
parent
359186b13b
commit
c5d409a292
|
@ -2647,6 +2647,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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
6
hw/xfree86/xkb/Makefile.am
Normal file
6
hw/xfree86/xkb/Makefile.am
Normal file
|
@ -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
|
12
hw/xfree86/xkb/meson.build
Normal file
12
hw/xfree86/xkb/meson.build
Normal file
|
@ -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,
|
||||
)
|
|
@ -81,7 +81,7 @@ libxservertest_la_LIBADD += \
|
|||
$(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 \
|
||||
@XORG_LIBS@
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user