Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc) required because of commit7c0709a736
, which made requestingClient in dix specific to Xprint only. Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of $(XSERVER_LIBS) to override definitions in libdix.la for standard xservers. Follows571206832d
(providing -DXPRINT to xprint subdirs). Note it may be possible to restructure the code so that requestingClient is stored elsewhere than in dix. See discussions following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html If this is done it may be possible to revert this commit (if not 571206...). (cherry picked from commit966ae1781f
)
This commit is contained in:
parent
30774d6b3c
commit
2f994cb00e
@ -1,4 +1,10 @@
|
||||
noinst_LTLIBRARIES = libdix.la libxpstubs.la
|
||||
standard_dix_libs = libdix.la libxpstubs.la
|
||||
|
||||
if XPRINT
|
||||
noinst_LTLIBRARIES = $(standard_dix_libs) libXpdix.la
|
||||
else
|
||||
noinst_LTLIBRARIES = $(standard_dix_libs)
|
||||
endif
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) \
|
||||
-DVENDOR_NAME=\""@VENDOR_NAME@"\" \
|
||||
@ -39,7 +45,11 @@ libdix_la_SOURCES = \
|
||||
libxpstubs_la_SOURCES = \
|
||||
xpstubs.c
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/Xprint
|
||||
if XPRINT
|
||||
libXpdix_la_SOURCES = $(libdix_la_SOURCES)
|
||||
libXpdix_la_CPPFLAGS = -I$(top_srcdir)/hw/xprint
|
||||
libXpdix_la_CFLAGS = $(AM_CFLAGS) $(XPRINT_CFLAGS)
|
||||
endif
|
||||
|
||||
EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
|
||||
|
||||
|
@ -17,6 +17,7 @@ XPRINT_LIBS = \
|
||||
pcl-mono/libpcl.la \
|
||||
$(top_builddir)/fb/libfb.la \
|
||||
$(top_builddir)/render/librender.la \
|
||||
$(top_builddir)/dix/libXpdix.la \
|
||||
$(XSERVER_LIBS) \
|
||||
$(top_builddir)/Xext/libXext.la \
|
||||
$(top_builddir)/xkb/libxkb.la \
|
||||
|
Loading…
Reference in New Issue
Block a user