system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-15 19:59:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: change library name

Browse source 
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti 2012-05-23 23:04:14 +03:00 committed by Kristian Høgsberg
parent 6150072283
commit 629ce23bd0
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -38,12 +38,12 @@ AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],,
AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes)
AC_ARG_ENABLE(xserver-launcher, [ --enable-xserver-launcher],,
enable_xserver_launcher=yes)
AM_CONDITIONAL(ENABLE_XSERVER_LAUNCHER, test x$enable_xserver_launcher = xyes)
if test x$enable_xserver_launcher = xyes; then
PKG_CHECK_MODULES([XSERVER_LAUNCHER], xcb xcb-xfixes cairo-xcb)
AC_DEFINE([BUILD_XSERVER_LAUNCHER], [1], [Build the X server launcher])
AC_ARG_ENABLE(xwayland, [ --enable-xwayland],,
enable_xwayland=yes)
AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes)
if test x$enable_xwayland = xyes; then
PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes cairo-xcb)
AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
[Path to X server]), [XSERVER_PATH="$withval"],

2
src/Makefile.am
View file

@ -24,7 +24,7 @@ weston_SOURCES = \
weston-launch.h \
weston-egl-ext.h
if ENABLE_XSERVER_LAUNCHER
if ENABLE_XWAYLAND
SUBDIRS = xwayland
endif

2
src/compositor.c
View file

@ -2912,7 +2912,7 @@ int main(int argc, char *argv[])
module_init = NULL;
if (xserver)
module_init = load_module("xserver-launcher.so",
module_init = load_module("xwayland.so",
"weston_xserver_init",
&xserver_module);
if (module_init && module_init(ec) < 0)

14
src/xwayland/Makefile.am
View file

@ -5,15 +5,15 @@ AM_CPPFLAGS = \
-DXSERVER_PATH='"@XSERVER_PATH@"'
moduledir = @libdir@/weston
module_LTLIBRARIES = xserver-launcher.la
module_LTLIBRARIES = xwayland.la
xserver_launcher = xserver-launcher.la
xserver_launcher_la_LDFLAGS = -module -avoid-version
xserver_launcher_la_LIBADD = \
$(XSERVER_LAUNCHER_LIBS) \
xwayland = xwayland.la
xwayland_la_LDFLAGS = -module -avoid-version
xwayland_la_LIBADD = \
$(XWAYLAND) \
$(top_builddir)/shared/libshared.la
xserver_launcher_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
xserver_launcher_la_SOURCES = \
xwayland_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
xwayland_la_SOURCES = \
window-manager.c \
selection.c \
launcher.c \