Commit c1703cdf authored by Adam Jackson's avatar Adam Jackson 🥃

xfree86: Link fb statically

There's no real benefit to leaving this loadable, virtually every driver
is going to load it.
Reviewed-by: Jon Turney's avatarJon Turney <jon.turney@dronecode.org.uk>
parent d9ec5250
......@@ -75,6 +75,7 @@ LOCAL_LIBS = \
$(DRI2_LIB) \
$(DRI3_LIB) \
$(GLXVND_LIB) \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/miext/sync/libsync.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la \
......
......@@ -4,8 +4,7 @@ if GLX
GLXMODS = libglx.la
endif
module_LTLIBRARIES = libfb.la \
libwfb.la \
module_LTLIBRARIES = libwfb.la \
libshadow.la
extsmoduledir = $(moduledir)/extensions
......@@ -17,11 +16,6 @@ AM_CPPFLAGS = @XORG_INCS@ \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/glx
libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
libfb_la_SOURCES = fbmodule.c
libfb_la_CFLAGS = $(AM_CFLAGS)
libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
libwfb_la_SOURCES = fbmodule.c
......
fb = shared_module(
'fb',
'fbmodule.c',
include_directories: [inc, xorg_inc],
c_args: xorg_c_args,
dependencies: common_dep,
link_whole: libxserver_fb,
link_with: e,
install: true,
install_dir: module_dir,
)
shared_module(
'wfb',
'fbmodule.c',
......
......@@ -30,7 +30,6 @@ shared_module(
xorg_build_root = join_paths(meson.build_root(), 'hw', 'xfree86')
symbol_test_args = []
symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so')
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libfb.so')
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
if gbm_dep.found()
symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
......
......@@ -621,6 +621,7 @@ DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
static const char *compiled_in_modules[] = {
"ddc",
"fb",
"i2c",
"ramdac",
"dbe",
......
......@@ -61,6 +61,7 @@ xorg_link = [
xorg_os_support,
xorg_parser,
xorg_ramdac,
libxserver_fb,
libxserver_xext_vidmode,
libxserver_main,
libxserver_config,
......
......@@ -21,13 +21,13 @@ cat > sdksyms.c << EOF
#include "picturestr.h"
/* fb/Makefile.am -- module */
/*
/* fb/Makefile.am */
#include "fb.h"
#include "fbrop.h"
#include "fboverlay.h"
#include "wfbrename.h"
#include "fbpict.h"
/* wfb is still a module
#include "wfbrename.h"
*/
......
......@@ -146,6 +146,7 @@ tests_LDADD += \
$(top_builddir)/hw/xfree86/i2c/libi2c.la \
$(top_builddir)/hw/xfree86/xkb/libxorgxkb.la \
$(top_builddir)/Xext/libXvidmode.la \
$(top_builddir)/fb/libfb.la \
$(XSERVER_LIBS) \
$(XORG_LIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment