From e716baedc4d8e52a60f43ef21aba771b340d8c8b Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat, 31 Mar 2012 14:42:45 +0100
Subject: [PATCH] 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>
---
 Makefile.am                               | 2 ++
 configure.ac                              | 1 +
 hw/xquartz/Makefile.am                    | 4 ++--
 hw/xwin/Makefile.am                       | 1 +
 pseudoramiX/Makefile.am                   | 7 +++++++
 {hw/xquartz => pseudoramiX}/pseudoramiX.c | 0
 {hw/xquartz => pseudoramiX}/pseudoramiX.h | 0
 7 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 pseudoramiX/Makefile.am
 rename {hw/xquartz => pseudoramiX}/pseudoramiX.c (100%)
 rename {hw/xquartz => pseudoramiX}/pseudoramiX.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 9a628537d..7be4271d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/configure.ac b/configure.ac
index d27ca2392..225b70fbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2256,6 +2256,7 @@ miext/damage/Makefile
 miext/shadow/Makefile
 miext/rootless/Makefile
 os/Makefile
+pseudoramiX/Makefile
 randr/Makefile
 render/Makefile
 xkb/Makefile
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index a7cc012d9..2e894d705 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -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 \
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 831e7dc47..c7006959c 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -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)
diff --git a/pseudoramiX/Makefile.am b/pseudoramiX/Makefile.am
new file mode 100644
index 000000000..17b664b9e
--- /dev/null
+++ b/pseudoramiX/Makefile.am
@@ -0,0 +1,7 @@
+# Fake Xinerama extension
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+noinst_LTLIBRARIES = libPseudoramiX.la
+
+libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h
diff --git a/hw/xquartz/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
similarity index 100%
rename from hw/xquartz/pseudoramiX.c
rename to pseudoramiX/pseudoramiX.c
diff --git a/hw/xquartz/pseudoramiX.h b/pseudoramiX/pseudoramiX.h
similarity index 100%
rename from hw/xquartz/pseudoramiX.h
rename to pseudoramiX/pseudoramiX.h