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

Add buildsystem for Xprint, and:

Browse Source 
Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint
This commit is contained in:
Søren Sandmann Pedersen 2005-08-17 19:03:18 +00:00
parent f2f6820c3f
commit df938987d6
10 changed files with 150 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
* Xext/Makefile.am: Conditionally compile in xprint.c
* Makefile.am, configure.ac: Add Xprint
Tue Aug 16 12:09:09 2005 Søren Sandmann <sandmann@redhat.com>
* hw/xfree86/dixmods/Makefile.am: Add ft and type1 modules.

3
Makefile.am
View File

@ -47,7 +47,8 @@ SUBDIRS= \
$(XTRAP_DIR) \
$(COMPOSITE_DIR) \
$(GLX_DIR) \
hw
hw \
Xprint
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-server.pc

8
Xext/Makefile.am
View File

@ -30,6 +30,10 @@ if XEVIE
XEVIE_SRCS = xevie.c EVIstruct.h
endif
if XPRINT
XPRINT_SRCS = xprint.c
endif
INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
AM_CFLAGS = $(DIX_CFLAGS)
@ -60,4 +64,6 @@ libXext_la_SOURCES = \
$(SCREENSAVER_SRCS) \
$(PANORAMIX_SRCS) \
$(XCSECURITY_SRCS) \
$(XEVIE_SRCS)
$(XEVIE_SRCS) \
$(XPRINT_SRCS)

4
Xext/xprint.c
View File

@ -83,8 +83,8 @@ copyright holders.
#include "extnsionst.h"
#include "dixstruct.h"
#include <X11/Xatom.h>
#include "Print.h"
#include "Printstr.h"
#include <X11/extensions/Print.h>
#include <X11/extensions/Printstr.h>
#include "../Xprint/DiPrint.h"
#include "../Xprint/attributes.h"
#include "modinit.h"

4
Xprint/Init.c
View File

@ -82,14 +82,14 @@ copyright holders.
#include "inputstr.h"
#include "gcstruct.h"
#include "fonts/fontstruct.h"
#include <X11/fonts/fontstruct.h>
#include "errno.h"
typedef char *XPointer;
#define HAVE_XPointer 1
#define Status int
#include <Xresource.h>
#include <X11/Xresource.h>
#include "DiPrint.h"
#include "attributes.h"

33
Xprint/Makefile.am Normal file
View File

@ -0,0 +1,33 @@
SUBDIRS = pcl raster ps
bin_PROGRAMS = Xprt
Xprt_CFLAGS = @DIX_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ -DXPRINTDIR=\"$(prefix)/X11/xserver\"
Xprt_LDFLAGS = -L$(top_srcdir)
Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
miinitext-wrapper.c:
echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
dpmsstubs-wrapper.c:
echo "#include \"$(top_srcdir)/Xext/dpmsstubs.c\"" >> $@
Xprt_SOURCES = \
attributes.c \
attributes.h \
AttrValid.c \
AttrValid.h \
ddxInit.c \
DiPrint.h \
Init.c \
mediaSizes.c \
Oid.c \
OidDefs.h \
Oid.h \
OidStrs.h \
spooler.c \
spooler.h \
Util.c \
miinitext-wrapper.c \
dpmsstubs-wrapper.c

30
Xprint/pcl/Makefile.am Normal file
View File

@ -0,0 +1,30 @@
noinst_LTLIBRARIES = libpcl.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
libpcl_la_SOURCES = \
PclArc.c \
PclArea.c \
PclAttr.c \
PclAttVal.c \
PclColor.c \
PclCursor.c \
PclDef.h \
PclFonts.c \
PclGC.c \
Pcl.h \
PclInit.c \
PclLine.c \
Pclmap.h \
PclMisc.c \
PclPixel.c \
PclPixmap.c \
PclPolygon.c \
PclPrint.c \
PclSFonts.c \
PclSFonts.h \
PclSpans.c \
PclText.c \
PclWindow.c

36
Xprint/ps/Makefile.am Normal file
View File

@ -0,0 +1,36 @@
noinst_LTLIBRARIES = libps.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
libps_la_SOURCES = \
PsArc.c \
PsArea.c \
PsAttr.c \
PsAttVal.c \
PsCache.c \
PsColor.c \
PsDef.h \
PsFonts.c \
PsGC.c \
Ps.h \
PsImageUtil.c \
PsInit.c \
PsLine.c \
PsMisc.c \
psout.c \
psout.h \
PsPixel.c \
PsPixmap.c \
PsPolygon.c \
PsPrint.c \
PsSpans.c \
PsText.c \
PsWindow.c
EXTRA_DIST = PsFTFonts.c \
psout_ft.c \
psout_ftpstype1.c \
psout_ftpstype3.c \
ttf2pt1wrap.c

10
Xprint/raster/Makefile.am Normal file
View File

@ -0,0 +1,10 @@
noinst_LTLIBRARIES = libraster.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
libraster_la_SOURCES = \
RasterAttVal.c \
Raster.c \
Raster.h

23
configure.ac
View File

@ -166,6 +166,7 @@ DEFAULT_VENDOR_RELEASE="$PACKAGE_VERSION"
VERSION_STRING="6,99,99,900,0"
DEFAULT_VENDOR_WEB="http://wiki.x.org"
EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la'
XPRINT_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'" "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/randr/librandr.la'" "'$(top_builddir)/Xi/libXi.la'" "'$(top_builddir)/xfixes/libxfixes.la'" "'$(top_builddir)/damageext/libdamageext.la'
DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'
EXTENSION_INCS='-I$(top_srcdir)/Xext'
AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server])
@ -194,6 +195,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb],[Build Xvfb server
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest],[Build Xnest server (default: auto)]),[XNEST=$enableval],[XNEST=auto])
AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin],[Build XWin server (default: auto)]),[XWIN=$enableval],[XWIN=auto])
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--enable-xevie],[Build XEvIE extension (default: disabled)]), [XEVIE=$enableval],[XEVIE=no])
AC_ARG_ENABLE(xprint, AS_HELP_STRING([--disable-xprint],[Build Xprint extension and server (default: auto)]), [XPRINT=$enableval],[XPRINT=auto])
# Transport selection
AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
@ -285,7 +287,20 @@ if test "$XNEST" = yes; then
fi
AM_CONDITIONAL(XNEST, [test x$XNEST = xyes])
#
# XPRINT
#
if test "$XPRINT" = auto; then
PKG_CHECK_MODULES([XPRINT], [printproto x11], [XPRINT=yes], [XPRINT=no])
fi
if test x$XPRINT = xyes; then
PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont])
fi
AM_CONDITIONAL(XPRINT, [test x$XPRINT = xyes])
AC_MSG_CHECKING([whether to build Xprint DDX])
AC_MSG_RESULT([$XPRINT])
# Checks to see if we should compile in MMX support (there will be
# a runtime test when the code is actually run to see if it should
# be used - this just checks if we can compile it.)
@ -651,6 +666,7 @@ XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE
XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB"
XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB"
XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $DAMAGE_LIB"
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
@ -764,6 +780,7 @@ AC_SUBST([XNEST_LIBS])
AC_SUBST([XWIN_LIBS])
AC_SUBST([EXTENSION_LIBS])
AC_SUBST([XDMX_LIBS])
AC_SUBST([XPRINT_LIBS])
AC_SUBST([XORG_INCS])
AC_SUBST([XORG_OS])
AC_SUBST([XORG_OS_SUBDIR])
@ -975,5 +992,9 @@ hw/dmx/Makefile
hw/vfb/Makefile
hw/xnest/Makefile
hw/xwin/Makefile
Xprint/Makefile
Xprint/pcl/Makefile
Xprint/raster/Makefile
Xprint/ps/Makefile
xorg-server.pc
])