From f23dd02b969089b66685f70887f19041049f7a24 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri, 21 Feb 2014 18:11:33 +0000
Subject: [PATCH] Build Xi/stubs.c once as a convenience library, rather than
 once for each DDX which wants to use it

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
---
 Xi/Makefile.am       | 5 +++--
 hw/vfb/Makefile.am   | 4 ++--
 hw/xnest/Makefile.am | 4 ++--
 hw/xwin/Makefile.am  | 4 ++--
 test/Makefile.am     | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Xi/Makefile.am b/Xi/Makefile.am
index af85bd049..6c456c4ac 100644
--- a/Xi/Makefile.am
+++ b/Xi/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libXi.la
+noinst_LTLIBRARIES = libXi.la libXistubs.la
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
@@ -107,4 +107,5 @@ libXi_la_SOURCES =	\
 	xiwarppointer.c \
 	xiwarppointer.h
 
-EXTRA_DIST = stubs.c
+libXistubs_la_SOURCES =	\
+	stubs.c
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index c9f6957b4..a02a43820 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -9,7 +9,6 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
 
 SRCS =	InitInput.c \
 	InitOutput.c \
-	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c
 
 libfbcmap_a_CFLAGS = $(AM_CFLAGS)
@@ -22,7 +21,8 @@ XVFB_LIBS = \
 	libfbcmap.a \
 	$(MAIN_LIB) \
 	$(XSERVER_LIBS) \
-	$(top_builddir)/Xext/libXextdpmsstubs.la
+	$(top_builddir)/Xext/libXextdpmsstubs.la \
+	$(top_builddir)/Xi/libXistubs.la
 
 Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
 Xvfb_DEPENDENCIES = $(XVFB_LIBS)
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index c5560fdd6..bb8d3d821 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -42,7 +42,6 @@ SRCS =	Args.c \
 	XNPixmap.h \
 	XNWindow.h \
 	xnest-config.h \
-	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c
 
 libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
@@ -51,7 +50,8 @@ libfbcmap_a_CFLAGS = $(AM_CFLAGS)
 XNEST_LIBS = \
         @XNEST_LIBS@ \
 	libfbcmap.a \
-	$(top_builddir)/Xext/libXextdpmsstubs.la
+	$(top_builddir)/Xext/libXextdpmsstubs.la \
+	$(top_builddir)/Xi/libXistubs.la
 
 Xnest_SOURCES = $(SRCS)
 
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 666804504..b0da70493 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -127,7 +127,6 @@ SRCS =	InitInput.c \
 	winresource.h \
 	winwindow.h \
 	XWin.rc \
-	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c \
 	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(SRCS_CLIPBOARD) \
@@ -153,7 +152,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
 
 XWIN_SYS_LIBS += -ldxguid
 XWIN_LIBS += 	$(top_builddir)/pseudoramiX/libPseudoramiX.la \
-                $(top_builddir)/Xext/libXextdpmsstubs.la
+                $(top_builddir)/Xext/libXextdpmsstubs.la \
+                $(top_builddir)/Xi/libXistubs.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)
 XWin_LDFLAGS = -mwindows -static -Wl,--disable-stdcall-fixup
diff --git a/test/Makefile.am b/test/Makefile.am
index 7209fbd37..3ad24d9ec 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -70,8 +70,7 @@ endif
 else
 nodist_libxservertest_la_SOURCES = \
             ddxstubs.c \
-            $(top_srcdir)/mi/miinitext.c \
-            $(top_srcdir)/Xi/stubs.c
+            $(top_srcdir)/mi/miinitext.c
 
 libxservertest_la_LIBADD += \
             $(top_builddir)/damageext/libdamageext.la \
@@ -84,6 +83,7 @@ libxservertest_la_LIBADD += \
             $(top_builddir)/Xext/libXext.la \
             $(top_builddir)/Xext/libXextdpmsstubs.la \
             $(top_builddir)/Xi/libXi.la \
+            $(top_builddir)/Xi/libXistubs.la \
             $(top_builddir)/xfixes/libxfixes.la \
             $(top_builddir)/xkb/libxkb.la \
             $(top_builddir)/xkb/libxkbstubs.la