966ae1781f
(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...).
82 lines
1.6 KiB
Makefile
82 lines
1.6 KiB
Makefile
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@"\" \
|
|
-DVENDOR_RELEASE="@VENDOR_RELEASE@"
|
|
|
|
libdix_la_SOURCES = \
|
|
atom.c \
|
|
colormap.c \
|
|
cursor.c \
|
|
deprecated.c \
|
|
devices.c \
|
|
dispatch.c \
|
|
dispatch.h \
|
|
dixfonts.c \
|
|
dixutils.c \
|
|
events.c \
|
|
extension.c \
|
|
ffs.c \
|
|
gc.c \
|
|
getevents.c \
|
|
globals.c \
|
|
glyphcurs.c \
|
|
grabs.c \
|
|
initatoms.c \
|
|
main.c \
|
|
pixmap.c \
|
|
privates.c \
|
|
property.c \
|
|
registry.c \
|
|
resource.c \
|
|
selection.c \
|
|
swaprep.c \
|
|
swapreq.c \
|
|
tables.c \
|
|
window.c \
|
|
strcasecmp.c
|
|
|
|
libxpstubs_la_SOURCES = \
|
|
xpstubs.c
|
|
|
|
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
|
|
|
|
# Install list of protocol names
|
|
miscconfigdir = $(SERVER_MISC_CONFIG_PATH)
|
|
dist_miscconfig_DATA = protocol.txt
|
|
|
|
if XSERVER_DTRACE
|
|
# Generate dtrace header file for C sources to include
|
|
BUILT_SOURCES = Xserver-dtrace.h
|
|
|
|
Xserver-dtrace.h: $(srcdir)/Xserver.d
|
|
$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
|
|
|| cp Xserver-dtrace.h.in $@
|
|
|
|
# Generate dtrace object code for probes in libdix
|
|
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
|
|
$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
|
|
|
|
noinst_PROGRAMS = dix.O
|
|
|
|
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
|
|
ld -r -o $@ .libs/*.o
|
|
endif
|
|
|
|
dix.c:
|
|
touch $@
|
|
|
|
CLEANFILES = dix.c
|