Commit e716baed authored by Jon TURNEY's avatar Jon TURNEY

Move pseudoramiX code where it can be shared between Xwin and Xquartz

Move pseudoramiX code to a separate top-level directory.  Link Xwin and Xquartz
with libPseudoramiX

I'm not sure moving this to a top-level directory is appropriate, but I'm not
sure where else it fits.

Future work: pseudoramiX can probably be consolidated with the rrxinerama code
(which I think provides fake xinerama data when real XINERAMA is disabled and we
only have one screen)

v2: fix distcheck
Signed-off-by: default avatarJon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: default avatarColin Harrison <colin.harrison@virgin.net>
Reviewed-by: default avatarMarc Haesen <marha@users.sourceforge.net>
parent ce0217b9
......@@ -27,6 +27,7 @@ SUBDIRS = \
Xext \
miext \
os \
pseudoramiX \
randr \
render \
Xi \
......@@ -77,6 +78,7 @@ DIST_SUBDIRS = \
Xext \
miext \
os \
pseudoramiX \
randr \
render \
Xi \
......
......@@ -2256,6 +2256,7 @@ miext/damage/Makefile
miext/shadow/Makefile
miext/rootless/Makefile
os/Makefile
pseudoramiX/Makefile
randr/Makefile
render/Makefile
xkb/Makefile
......
......@@ -28,7 +28,6 @@ libXquartz_la_SOURCES = \
darwinEvents.c \
darwinXinput.c \
keysym2ucs.c \
pseudoramiX.c \
quartz.c \
quartzCocoa.m \
quartzKeyboard.c \
......@@ -36,6 +35,8 @@ libXquartz_la_SOURCES = \
quartzRandR.c \
console_redirect.c
libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la
EXTRA_DIST = \
X11Application.h \
X11Controller.h \
......@@ -44,7 +45,6 @@ EXTRA_DIST = \
darwinfb.h \
darwinEvents.h \
keysym2ucs.h \
pseudoramiX.h \
quartz.h \
quartzCommon.h \
quartzKeyboard.h \
......
......@@ -153,6 +153,7 @@ XWin_SOURCES = $(SRCS)
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
XWIN_SYS_LIBS += -ldxguid
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS)
XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
......
# Fake Xinerama extension
AM_CFLAGS = $(DIX_CFLAGS)
noinst_LTLIBRARIES = libPseudoramiX.la
libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h
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