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: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
This commit is contained in:
parent
ce0217b982
commit
e716baedc4
|
@ -27,6 +27,7 @@ SUBDIRS = \
|
||||||
Xext \
|
Xext \
|
||||||
miext \
|
miext \
|
||||||
os \
|
os \
|
||||||
|
pseudoramiX \
|
||||||
randr \
|
randr \
|
||||||
render \
|
render \
|
||||||
Xi \
|
Xi \
|
||||||
|
@ -77,6 +78,7 @@ DIST_SUBDIRS = \
|
||||||
Xext \
|
Xext \
|
||||||
miext \
|
miext \
|
||||||
os \
|
os \
|
||||||
|
pseudoramiX \
|
||||||
randr \
|
randr \
|
||||||
render \
|
render \
|
||||||
Xi \
|
Xi \
|
||||||
|
|
|
@ -2256,6 +2256,7 @@ miext/damage/Makefile
|
||||||
miext/shadow/Makefile
|
miext/shadow/Makefile
|
||||||
miext/rootless/Makefile
|
miext/rootless/Makefile
|
||||||
os/Makefile
|
os/Makefile
|
||||||
|
pseudoramiX/Makefile
|
||||||
randr/Makefile
|
randr/Makefile
|
||||||
render/Makefile
|
render/Makefile
|
||||||
xkb/Makefile
|
xkb/Makefile
|
||||||
|
|
|
@ -28,7 +28,6 @@ libXquartz_la_SOURCES = \
|
||||||
darwinEvents.c \
|
darwinEvents.c \
|
||||||
darwinXinput.c \
|
darwinXinput.c \
|
||||||
keysym2ucs.c \
|
keysym2ucs.c \
|
||||||
pseudoramiX.c \
|
|
||||||
quartz.c \
|
quartz.c \
|
||||||
quartzCocoa.m \
|
quartzCocoa.m \
|
||||||
quartzKeyboard.c \
|
quartzKeyboard.c \
|
||||||
|
@ -36,6 +35,8 @@ libXquartz_la_SOURCES = \
|
||||||
quartzRandR.c \
|
quartzRandR.c \
|
||||||
console_redirect.c
|
console_redirect.c
|
||||||
|
|
||||||
|
libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
X11Application.h \
|
X11Application.h \
|
||||||
X11Controller.h \
|
X11Controller.h \
|
||||||
|
@ -44,7 +45,6 @@ EXTRA_DIST = \
|
||||||
darwinfb.h \
|
darwinfb.h \
|
||||||
darwinEvents.h \
|
darwinEvents.h \
|
||||||
keysym2ucs.h \
|
keysym2ucs.h \
|
||||||
pseudoramiX.h \
|
|
||||||
quartz.h \
|
quartz.h \
|
||||||
quartzCommon.h \
|
quartzCommon.h \
|
||||||
quartzKeyboard.h \
|
quartzKeyboard.h \
|
||||||
|
|
|
@ -153,6 +153,7 @@ XWin_SOURCES = $(SRCS)
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
||||||
|
|
||||||
XWIN_SYS_LIBS += -ldxguid
|
XWIN_SYS_LIBS += -ldxguid
|
||||||
|
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la
|
||||||
|
|
||||||
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS)
|
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)
|
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)
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
# Fake Xinerama extension
|
||||||
|
|
||||||
|
AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libPseudoramiX.la
|
||||||
|
|
||||||
|
libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h
|
Loading…
Reference in New Issue