summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-08-17 19:03:18 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-08-17 19:03:18 +0000
commitdf938987d6c19fbdfff8d3334bb497f4814ae384 (patch)
treec1ebde912e9b640d6b0bb3aae1156c7e6b3c7958 /Xext
parentf2f6820c3f01810a4da5a8bb4e43119ef2a3fcb6 (diff)
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
Diffstat (limited to 'Xext')
-rw-r--r--Xext/Makefile.am8
-rw-r--r--Xext/xprint.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index ac5f9246b..d043555ba 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -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)
+
diff --git a/Xext/xprint.c b/Xext/xprint.c
index c59a8c008..60512d372 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -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"