diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-01-06 23:06:15 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-01-06 23:06:15 +0000 |
| commit | 13c9e0c094c4e34cd1e43a7cc08b2dca39a32412 (patch) | |
| tree | 020691234ce7de60ba19084616ab7362d944be0a /Xprint | |
| parent | fe0c838b5d8bc8d9cf5a686bb7d3e90682d2d19a (diff) | |
Bug #5525: Build a working Xprt. (Drew Parsons)
Diffstat (limited to 'Xprint')
| -rw-r--r-- | Xprint/Makefile.am | 12 | ||||
| -rw-r--r-- | Xprint/ddxInit.c | 5 | ||||
| -rw-r--r-- | Xprint/pcl-mono/Makefile.am | 5 | ||||
| -rw-r--r-- | Xprint/pcl/Makefile.am | 29 |
4 files changed, 20 insertions, 31 deletions
diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am index 4c5e6b586..a1c636ac2 100644 --- a/Xprint/Makefile.am +++ b/Xprint/Makefile.am @@ -1,13 +1,17 @@ -SUBDIRS = doc pcl raster ps etc +SUBDIRS = doc pcl pcl-mono raster ps etc bin_PROGRAMS = Xprt Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ - -DXPRINTDIR=\"$(prefix)/X11/xserver\" + -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ + -DXPRINTDIR=\"$(prefix)/X11/xserver\" \ + -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX Xprt_LDFLAGS = -L$(top_srcdir) -Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la +Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ + pcl/libpcl.la pcl-mono/libpcl.la \ + ../mfb/libmfb.la ../mi/libmi.la \ + ../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la miinitext-wrapper.c: echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@ diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index be16a3799..e68f26ae6 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -85,6 +85,11 @@ InitOutput( pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */ screenInfo.numVideoScreens = 0; + +#ifdef PRINT_ONLY_SERVER + PrinterInitOutput(pScreenInfo, argc, argv); +#endif + } static void diff --git a/Xprint/pcl-mono/Makefile.am b/Xprint/pcl-mono/Makefile.am new file mode 100644 index 000000000..4d8dfc682 --- /dev/null +++ b/Xprint/pcl-mono/Makefile.am @@ -0,0 +1,5 @@ +noinst_LTLIBRARIES = libpcl.la + +PCL_DRIVER = -DXP_PCL_MONO + +include ../pcl/Makefile.am.inc diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am index 144411c55..90133e8e2 100644 --- a/Xprint/pcl/Makefile.am +++ b/Xprint/pcl/Makefile.am @@ -1,31 +1,6 @@ noinst_LTLIBRARIES = libpcl.la -INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +PCL_DRIVER = -DXP_PCL_COLOR -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 +include ../pcl/Makefile.am.inc -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 |