Add buildsystem for Xprint, and:

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

5 files changed, 111 insertions, 2 deletions

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 889a036dc..0bc1cf39e 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -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"
diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am
new file mode 100644
index 000000000..c6f044923
--- /dev/null
+++ b/Xprint/Makefile.am
@@ -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
diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am
new file mode 100644
index 000000000..e8bbae09e
--- /dev/null
+++ b/Xprint/pcl/Makefile.am
@@ -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
diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am
new file mode 100644
index 000000000..a98dc3561
--- /dev/null
+++ b/Xprint/ps/Makefile.am
@@ -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
diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am
new file mode 100644
index 000000000..168bcfe41
--- /dev/null
+++ b/Xprint/raster/Makefile.am
@@ -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