Attachment #84605 for bug #128448

Lines 1632-1637 Link Here

(-)configure.ac (+1 lines)
1632	Xprint/Makefile	1632	Xprint/Makefile
1633	Xprint/doc/Makefile	1633	Xprint/doc/Makefile
1634	Xprint/pcl/Makefile	1634	Xprint/pcl/Makefile
		1635	Xprint/pcl-mono/Makefile
1635	Xprint/raster/Makefile	1636	Xprint/raster/Makefile
1636	Xprint/ps/Makefile	1637	Xprint/ps/Makefile
1637	Xprint/etc/Makefile	1638	Xprint/etc/Makefile




SUBDIRS = doc pcl pcl-mono raster ps etc

bin_PROGRAMS = Xprt

Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX

Xprt_LDFLAGS = -L$(top_srcdir)
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\"" >> $@

Lines 85-90 Link Here

(-)Xprint/ddxInit.c (+5 lines)
85		85
86	pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */	86	pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
87	screenInfo.numVideoScreens = 0;	87	screenInfo.numVideoScreens = 0;
		88
		89	#ifdef PRINT_ONLY_SERVER
		90	PrinterInitOutput(pScreenInfo, argc, argv);
		91	#endif
		92
88	}	93	}
89		94
90	static void	95	static void




noinst_LTLIBRARIES = libpcl.la

PCL_DRIVER = -DXP_PCL_COLOR

include ../pcl/Makefile.am.inc
	-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

Lines 9-15 Link Here

(-)cfb/Makefile.am (-1 / +1 lines)
9		9
10	libcfb_la_LIBADD = ../mfb/libmfb.la	10	libcfb_la_LIBADD = ../mfb/libmfb.la
11		11
12	AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@	12	AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
13		13
14	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support	14	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
15		15




cfbglrop8.c:
	echo "#define GLYPHROP" > $@
	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@


if XPRINT

PLATFORMDEFS = -DXFREE86

cfb8bit.c:   compiler.h

compiler.h:
	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@

endif


Lines 6-9 Link Here

(-)cfb16/Makefile.am (-1 / +1 lines)
6		6
7	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support	7	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
8		8
9	AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@	9	AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

Lines 6-11 Link Here

(-)cfb24/Makefile.am (-1 / +1 lines)
6		6
7	EXTRA_DIST = cfbrrop24.h	7	EXTRA_DIST = cfbrrop24.h
8		8
9	AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@	9	AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
10		10
11	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support	11	INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support

Lines 6-9 Link Here

(-)cfb32/Makefile.am (-1 / +1 lines)
6		6
7	INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support	7	INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
8		8
9	AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@	9	AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

Lines 250-256 Link Here

(-)mi/miinitext.c (-1 / +1 lines)
250	#include <X11/extensions/lbxstr.h>	250	#include <X11/extensions/lbxstr.h>
251	#endif	251	#endif
252	#ifdef XPRINT	252	#ifdef XPRINT
253	#include "Print.h"	253	#include <X11/extensions/Print.h>
254	#endif	254	#endif
255	#ifdef XAPPGROUP	255	#ifdef XAPPGROUP
256	#define _XAG_SERVER_	256	#define _XAG_SERVER_

Line 0 Link Here

(-)Xprint/pcl-mono/Makefile.am (+5 lines)
	1	noinst_LTLIBRARIES = libpcl.la
	2
	3	PCL_DRIVER = -DXP_PCL_MONO
	4
	5	include ../pcl/Makefile.am.inc




INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
 
AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
 
libpcl_la_SOURCES =		\
	$(srcdir)/../pcl/PclArc.c	\
	$(srcdir)/../pcl/PclArea.c	\
	$(srcdir)/../pcl/PclAttr.c	\
	$(srcdir)/../pcl/PclAttVal.c	\
	$(srcdir)/../pcl/PclColor.c	\
	$(srcdir)/../pcl/PclCursor.c	\
	$(srcdir)/../pcl/PclDef.h	\
	$(srcdir)/../pcl/PclFonts.c	\
	$(srcdir)/../pcl/PclGC.c	\
	$(srcdir)/../pcl/Pcl.h		\
	$(srcdir)/../pcl/PclInit.c	\
	$(srcdir)/../pcl/PclLine.c	\
	$(srcdir)/../pcl/Pclmap.h	\
	$(srcdir)/../pcl/PclMisc.c	\
	$(srcdir)/../pcl/PclPixel.c	\
	$(srcdir)/../pcl/PclPixmap.c	\
	$(srcdir)/../pcl/PclPolygon.c	\
	$(srcdir)/../pcl/PclPrint.c	\
	$(srcdir)/../pcl/PclSFonts.c	\
	$(srcdir)/../pcl/PclSFonts.h	\
	$(srcdir)/../pcl/PclSpans.c	\
	$(srcdir)/../pcl/PclText.c	\
	$(srcdir)/../pcl/PclWindow.c

Return to bug 128448

Lines 138-140 Link Here

(-)cfb/Makefile.am.inc (+13 lines)
138	cfbglrop8.c:	138	cfbglrop8.c:
139	echo "#define GLYPHROP" > $@	139	echo "#define GLYPHROP" > $@
140	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@	140	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
		141
		142
		143	if XPRINT
		144
		145	PLATFORMDEFS = -DXFREE86
		146
		147	cfb8bit.c: compiler.h
		148
		149	compiler.h:
		150	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
		151
		152	endif
		153

Lines 1-13 Link Here

(-)Xprint/Makefile.am (-4 / +8 lines)
1	SUBDIRS = doc pcl raster ps etc	1	SUBDIRS = doc pcl pcl-mono raster ps etc
2		2
3	bin_PROGRAMS = Xprt	3	bin_PROGRAMS = Xprt
4		4
5	Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \	5	Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
6	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \	6	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
7	-DXPRINTDIR=\"$(prefix)/X11/xserver\"	7	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\" \
		8	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
8		9
9	Xprt_LDFLAGS = -L$(top_srcdir)	10	Xprt_LDFLAGS = -L$(top_srcdir)
10	Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la	11	Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
		12	pcl/libpcl.la pcl-mono/libpcl.la \
		13	../mfb/libmfb.la ../mi/libmi.la \
		14	../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
11		15
12	miinitext-wrapper.c:	16	miinitext-wrapper.c:
13	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@	17	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@

Lines 1-31 Link Here

(-)Xprint/pcl/Makefile.am (-27 / +2 lines)
1	noinst_LTLIBRARIES = libpcl.la	1	noinst_LTLIBRARIES = libpcl.la
2		2
3	INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb	3	PCL_DRIVER = -DXP_PCL_COLOR
4		4
5	AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \	5	include ../pcl/Makefile.am.inc
6	-D_XP_PRINT_SERVER_ -DPSZ=8
7		6
8	libpcl_la_SOURCES = \
9	PclArc.c \
10	PclArea.c \
11	PclAttr.c \
12	PclAttVal.c \
13	PclColor.c \
14	PclCursor.c \
15	PclDef.h \
16	PclFonts.c \
17	PclGC.c \
18	Pcl.h \
19	PclInit.c \
20	PclLine.c \
21	Pclmap.h \
22	PclMisc.c \
23	PclPixel.c \
24	PclPixmap.c \
25	PclPolygon.c \
26	PclPrint.c \
27	PclSFonts.c \
28	PclSFonts.h \
29	PclSpans.c \
30	PclText.c \
31	PclWindow.c

Line 0 Link Here

(-)Xprint/pcl/Makefile.am.inc (+29 lines)
	1	INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
	2
	3	AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
	4	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
	5
	6	libpcl_la_SOURCES = \
	7	$(srcdir)/../pcl/PclArc.c \
	8	$(srcdir)/../pcl/PclArea.c \
	9	$(srcdir)/../pcl/PclAttr.c \
	10	$(srcdir)/../pcl/PclAttVal.c \
	11	$(srcdir)/../pcl/PclColor.c \
	12	$(srcdir)/../pcl/PclCursor.c \
	13	$(srcdir)/../pcl/PclDef.h \
	14	$(srcdir)/../pcl/PclFonts.c \
	15	$(srcdir)/../pcl/PclGC.c \
	16	$(srcdir)/../pcl/Pcl.h \
	17	$(srcdir)/../pcl/PclInit.c \
	18	$(srcdir)/../pcl/PclLine.c \
	19	$(srcdir)/../pcl/Pclmap.h \
	20	$(srcdir)/../pcl/PclMisc.c \
	21	$(srcdir)/../pcl/PclPixel.c \
	22	$(srcdir)/../pcl/PclPixmap.c \
	23	$(srcdir)/../pcl/PclPolygon.c \
	24	$(srcdir)/../pcl/PclPrint.c \
	25	$(srcdir)/../pcl/PclSFonts.c \
	26	$(srcdir)/../pcl/PclSFonts.h \
	27	$(srcdir)/../pcl/PclSpans.c \
	28	$(srcdir)/../pcl/PclText.c \
	29	$(srcdir)/../pcl/PclWindow.c