andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jon TURNEY 2014-02-21 18:11:33 +00:00
parent 45b223e1c2
commit f23dd02b96
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Xi/Makefile.am
View File

@ -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

4
hw/vfb/Makefile.am
View File

@ -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)

4
hw/xnest/Makefile.am
View File

@ -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)

4
hw/xwin/Makefile.am
View File

@ -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

4
test/Makefile.am
View File

@ -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