summaryrefslogtreecommitdiff
path: root/Xprint
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-02 06:02:45 +0000
committerKevin E Martin <kem@kem.org>2005-12-02 06:02:45 +0000
commit7c00afd0ec94e491f1a9ef32d6543ed51ea3319d (patch)
treeec85c667f59b7afcc9e263273552d4eba3e05632 /Xprint
parent924518605b613eb66aa569877fa9f131e6f2a2fd (diff)
Define XFree86Server only where it is required.
Diffstat (limited to 'Xprint')
-rw-r--r--Xprint/Makefile.am4
-rw-r--r--Xprint/pcl/Makefile.am3
-rw-r--r--Xprint/ps/Makefile.am3
-rw-r--r--Xprint/raster/Makefile.am3
4 files changed, 9 insertions, 4 deletions
diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am
index de8874493..4c5e6b586 100644
--- a/Xprint/Makefile.am
+++ b/Xprint/Makefile.am
@@ -2,7 +2,9 @@ SUBDIRS = doc pcl raster ps etc
bin_PROGRAMS = Xprt
-Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ -DXPRINTDIR=\"$(prefix)/X11/xserver\"
+Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_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
diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am
index e98434167..144411c55 100644
--- a/Xprint/pcl/Makefile.am
+++ b/Xprint/pcl/Makefile.am
@@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libpcl.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ -D_XP_PRINT_SERVER_ -DPSZ=8
libpcl_la_SOURCES = \
PclArc.c \
diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am
index 617e2aa64..20f82e7b9 100644
--- a/Xprint/ps/Makefile.am
+++ b/Xprint/ps/Makefile.am
@@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libps.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
libps_la_SOURCES = \
PsArc.c \
diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am
index 2afd29c32..fe14a0780 100644
--- a/Xprint/raster/Makefile.am
+++ b/Xprint/raster/Makefile.am
@@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libraster.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ -D_XP_PRINT_SERVER_ -DPSZ=8
libraster_la_SOURCES = \
RasterAttVal.c \