summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrtr <rtr@NetBSD.org>2003-12-21 03:07:01 +0000
committerrtr <rtr@NetBSD.org>2003-12-21 03:07:01 +0000
commit12c87cdca38aaeeb97583f4d586dc6fa13bc629a (patch)
tree84ed12e3a0634898283e5681989e43727209e41f
parent61b5ab403f9fbdd60302bd38f1a5f5df9cd05420 (diff)
Separate loadable modules
Don't build or install modules for non-loadable xservers
-rw-r--r--x11/Xserver/GL/GLcore/Makefile82
-rw-r--r--x11/Xserver/GL/GLcore/Makefile.GLcore75
-rw-r--r--x11/Xserver/GL/GLcore/module/Makefile12
-rw-r--r--x11/Xserver/GL/glx/Makefile4
-rw-r--r--x11/Xserver/Makefile.serverlib6
-rw-r--r--x11/Xserver/Xext/Makefile11
-rw-r--r--x11/Xserver/Xext/Makefile.ext4
-rw-r--r--x11/Xserver/Xext/ext/Makefile13
-rw-r--r--x11/Xserver/Xext/extmod/Makefile3
-rw-r--r--x11/Xserver/Xext/exts/Makefile3
-rw-r--r--x11/Xserver/cfb/Makefile8
-rw-r--r--x11/Xserver/cfb/Makefile.cfb6
-rw-r--r--x11/Xserver/cfb/module/Makefile7
-rw-r--r--x11/Xserver/cfb16/Makefile8
-rw-r--r--x11/Xserver/cfb16/module/Makefile7
-rw-r--r--x11/Xserver/cfb24/Makefile8
-rw-r--r--x11/Xserver/cfb24/module/Makefile7
-rw-r--r--x11/Xserver/cfb32/Makefile8
-rw-r--r--x11/Xserver/cfb32/module/Makefile7
-rw-r--r--x11/Xserver/dbe/Makefile4
-rw-r--r--x11/Xserver/fb/Makefile38
-rw-r--r--x11/Xserver/fb/Makefile.fb31
-rw-r--r--x11/Xserver/fb/module/Makefile6
-rw-r--r--x11/Xserver/mfb/Makefile83
-rw-r--r--x11/Xserver/mfb/Makefile.mfb76
-rw-r--r--x11/Xserver/mfb/module/Makefile6
-rw-r--r--x11/Xserver/record/Makefile4
-rw-r--r--x11/Xserver/xtrap/Makefile4
28 files changed, 321 insertions, 210 deletions
diff --git a/x11/Xserver/GL/GLcore/Makefile b/x11/Xserver/GL/GLcore/Makefile
index b36a117461a..af114835f84 100644
--- a/x11/Xserver/GL/GLcore/Makefile
+++ b/x11/Xserver/GL/GLcore/Makefile
@@ -1,79 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/12/19 15:23:43 rtr Exp $
-
-XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
+# $NetBSD: Makefile,v 1.4 2003/12/21 03:07:01 rtr Exp $
.include "../../Makefile.serverlib"
+.include "Makefile.GLcore"
-.include <bsd.own.mk>
-
-LIB= GLcore
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src
-SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c \
- api_noop.c api_validate.c attrib.c blend.c buffers.c \
- clip.c colortab.c config.c context.c convolve.c \
- debug.c depth.c dispatch.c dlist.c drawpix.c enable.c \
- enums.c eval.c extensions.c feedback.c fog.c get.c \
- glapi.c glthread.c hash.c hint.c histogram.c image.c \
- imports.c light.c lines.c matrix.c mem.c mmath.c \
- pixel.c points.c polygon.c rastpos.c state.c \
- stencil.c texformat.c teximage.c texobj.c texstate.c \
- texstore.c texutil.c varray.c vtxfmt.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math
-SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c \
- m_debug_vertex.c m_eval.c m_matrix.c m_translate.c \
- m_vector.c m_vertices.c m_xform.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache
-SRCS+= ac_context.c ac_import.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast
-SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
- s_alphabuf.c s_bitmap.c s_blend.c s_buffers.c \
- s_context.c s_copypix.c s_depth.c s_drawpix.c \
- s_feedback.c s_fog.c s_histogram.c s_imaging.c \
- s_lines.c s_logic.c s_masking.c s_pb.c s_pixeltex.c \
- s_points.c s_readpix.c s_scissor.c s_span.c \
- s_stencil.c s_texstore.c s_texture.c s_triangle.c \
- s_zoom.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
-SRCS+= ss_context.c ss_triangle.c ss_vb.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl
-SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \
- t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
- t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
- t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
- t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
- t_vb_vertex.c
-
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
-.PATH: ${X11SRCDIR.xc}/lib/GL/glx
-SRCS+= compsize.c xf86glx.c xf86glx_util.c xm_api.c xm_dd.c \
- xm_line.c xm_span.c xm_tri.c
-
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore
-SRCS+= GLcoremodule.c
-
-XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
-
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/extras/Mesa/include \
- -I${X11SRCDIR.xc}/lib/GL/include \
- -I${X11SRCDIR.xc}/extras/Mesa/src \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${XSERVERINCDIR} \
- -I${X11SRCDIR.xc}/extras/Mesa/src/X \
- -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
- -I${X11SRCDIR.xc}/programs/Xserver/GL/include \
- -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
-
-CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
-
-.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
-.include <bsd.lib.mk>
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/GL/GLcore/Makefile.GLcore b/x11/Xserver/GL/GLcore/Makefile.GLcore
new file mode 100644
index 00000000000..613beb2c757
--- /dev/null
+++ b/x11/Xserver/GL/GLcore/Makefile.GLcore
@@ -0,0 +1,75 @@
+# $NetBSD: Makefile.GLcore,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+.include <bsd.own.mk>
+
+LIB= GLcore
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src
+SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c \
+ api_noop.c api_validate.c attrib.c blend.c buffers.c \
+ clip.c colortab.c config.c context.c convolve.c \
+ debug.c depth.c dispatch.c dlist.c drawpix.c enable.c \
+ enums.c eval.c extensions.c feedback.c fog.c get.c \
+ glapi.c glthread.c hash.c hint.c histogram.c image.c \
+ imports.c light.c lines.c matrix.c mem.c mmath.c \
+ pixel.c points.c polygon.c rastpos.c state.c \
+ stencil.c texformat.c teximage.c texobj.c texstate.c \
+ texstore.c texutil.c varray.c vtxfmt.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math
+SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c \
+ m_debug_vertex.c m_eval.c m_matrix.c m_translate.c \
+ m_vector.c m_vertices.c m_xform.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache
+SRCS+= ac_context.c ac_import.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast
+SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
+ s_alphabuf.c s_bitmap.c s_blend.c s_buffers.c \
+ s_context.c s_copypix.c s_depth.c s_drawpix.c \
+ s_feedback.c s_fog.c s_histogram.c s_imaging.c \
+ s_lines.c s_logic.c s_masking.c s_pb.c s_pixeltex.c \
+ s_points.c s_readpix.c s_scissor.c s_span.c \
+ s_stencil.c s_texstore.c s_texture.c s_triangle.c \
+ s_zoom.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
+SRCS+= ss_context.c ss_triangle.c ss_vb.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl
+SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \
+ t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
+ t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
+ t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
+ t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
+ t_vb_vertex.c
+
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/X
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
+.PATH: ${X11SRCDIR.xc}/lib/GL/glx
+SRCS+= compsize.c xf86glx.c xf86glx_util.c xm_api.c xm_dd.c \
+ xm_line.c xm_span.c xm_tri.c
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore
+SRCS+= GLcoremodule.c
+
+XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/extras/Mesa/include \
+ -I${X11SRCDIR.xc}/lib/GL/include \
+ -I${X11SRCDIR.xc}/extras/Mesa/src \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${XSERVERINCDIR} \
+ -I${X11SRCDIR.xc}/extras/Mesa/src/X \
+ -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
+ -I${X11SRCDIR.xc}/programs/Xserver/GL/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/src/X
+
+CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
+
+.include <bsd.x11.mk>
+LIBDIR= ${XMODULEDIR}
+.include <bsd.lib.mk>
diff --git a/x11/Xserver/GL/GLcore/module/Makefile b/x11/Xserver/GL/GLcore/module/Makefile
new file mode 100644
index 00000000000..ebade0aa051
--- /dev/null
+++ b/x11/Xserver/GL/GLcore/module/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
+
+.include "../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore
+SRCS= GLcoremodule.c
+
+.include "../Makefile.GLcore"
diff --git a/x11/Xserver/GL/glx/Makefile b/x11/Xserver/GL/glx/Makefile
index 0525ac5c720..92482ca4144 100644
--- a/x11/Xserver/GL/glx/Makefile
+++ b/x11/Xserver/GL/glx/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/09/23 23:21:04 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/21 03:07:01 rtr Exp $
.include "../../Makefile.serverlib"
.include "Makefile.glx"
+.if defined(X11FLAGS.LOADABLE)
SUBDIR= module
.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/Makefile.serverlib b/x11/Xserver/Makefile.serverlib
index 61cc2a9aca7..bfcac232320 100644
--- a/x11/Xserver/Makefile.serverlib
+++ b/x11/Xserver/Makefile.serverlib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.1 2003/09/23 23:21:02 lukem Exp $
+# $NetBSD: Makefile.serverlib,v 1.2 2003/12/21 03:07:01 rtr Exp $
NOLINT= 1
NOPIC= 1
@@ -9,3 +9,7 @@ libinstall::
.endif
CPPFLAGS+= ${X11FLAGS.SERVER}
+
+.if defined(XMODULEDIR)
+CPPFLAGS+= ${X11FLAGS.LOADABLE}
+.endif
diff --git a/x11/Xserver/Xext/Makefile b/x11/Xserver/Xext/Makefile
index 1383ba17237..a29f52e6cdf 100644
--- a/x11/Xserver/Xext/Makefile
+++ b/x11/Xserver/Xext/Makefile
@@ -1,5 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2003/09/23 23:21:05 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/21 03:07:01 rtr Exp $
-SUBDIR= ext exts extmod
+SUBDIR= ext exts
+
+.include "../Makefile.serverlib"
+.include "Makefile.ext"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR+= extmod
+.endif
.include <bsd.subdir.mk>
diff --git a/x11/Xserver/Xext/Makefile.ext b/x11/Xserver/Xext/Makefile.ext
index c7e2a18a5ca..73413e5d8e1 100644
--- a/x11/Xserver/Xext/Makefile.ext
+++ b/x11/Xserver/Xext/Makefile.ext
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile.ext,v 1.3 2003/09/30 06:41:29 lukem Exp $
-
-.include "../Makefile.serverlib"
+# $NetBSD: Makefile.ext,v 1.4 2003/12/21 03:07:01 rtr Exp $
.include <bsd.own.mk>
diff --git a/x11/Xserver/Xext/ext/Makefile b/x11/Xserver/Xext/ext/Makefile
index bd18c4ecab8..e9853e2952a 100644
--- a/x11/Xserver/Xext/ext/Makefile
+++ b/x11/Xserver/Xext/ext/Makefile
@@ -1,14 +1,19 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
LIB= ext
SRCS= EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \
panoramiX.c panoramiXSwap.c panoramiXprocs.c sampleEVI.c \
saver.c security.c shape.c shm.c sleepuntil.c sync.c \
- xcmisc.c xf86bigfont.c xf86dga.c xf86dga2.c xf86misc.c \
- xf86vmode.c xprint.c xres.c xtest.c xtest1dd.c xtest1di.c \
- xvdisp.c xvmain.c xvmc.c
+ xcmisc.c xf86bigfont.c xprint.c xres.c xtest.c xtest1dd.c \
+ xtest1di.c xvdisp.c xvmain.c xvmc.c
+
+# XXX dga should be enabled for sparc64 but isn't.
+.if ${MACHINE} != "sparc" && ${MACHINE} != "sparc64"
+SRCS+= xf86vmode.c xf86misc.c xf86dga.c xf86dga2.c
+.endif
FILESDIR= ${X11LIBDIR}/xserver
FILES= SecurityPolicy
+.include "../../Makefile.serverlib"
.include "../Makefile.ext"
diff --git a/x11/Xserver/Xext/extmod/Makefile b/x11/Xserver/Xext/extmod/Makefile
index 7216b1b50dc..a4f2f75635f 100644
--- a/x11/Xserver/Xext/extmod/Makefile
+++ b/x11/Xserver/Xext/extmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/09/23 23:21:06 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
LIB= extmod
SRCS= modinit.c shape.c mitmisc.c bigreq.c sync.c saver.c xcmisc.c \
@@ -10,6 +10,7 @@ CPPFLAGS+= -DEXTMODULE
XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
+.include "../../Makefile.serverlib"
.include "../Makefile.ext"
.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext/extmod
diff --git a/x11/Xserver/Xext/exts/Makefile b/x11/Xserver/Xext/exts/Makefile
index 1bbc0471398..777117ed9e3 100644
--- a/x11/Xserver/Xext/exts/Makefile
+++ b/x11/Xserver/Xext/exts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
LIB= exts
SRCS= appgroup.c panoramiX.c panoramiXSwap.c panoramiXprocs.c \
security.c shm.c sleepuntil.c xf86bigfont.c xprint.c \
xtest.c xtest1dd.c xtest1di.c
+.include "../../Makefile.serverlib"
.include "../Makefile.ext"
diff --git a/x11/Xserver/cfb/Makefile b/x11/Xserver/cfb/Makefile
index 0d9a4567865..eebdf057f9a 100644
--- a/x11/Xserver/cfb/Makefile
+++ b/x11/Xserver/cfb/Makefile
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
PIXELSIZE= 8
+.include "../Makefile.serverlib"
.include "Makefile.cfb"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/cfb/Makefile.cfb b/x11/Xserver/cfb/Makefile.cfb
index bc7f2db03bd..cea30a433ba 100644
--- a/x11/Xserver/cfb/Makefile.cfb
+++ b/x11/Xserver/cfb/Makefile.cfb
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile.cfb,v 1.5 2003/09/30 06:41:29 lukem Exp $
-
-XMODULEDIR= ${X11ROOTDIR}/lib/modules
-
-.include "../Makefile.serverlib"
+# $NetBSD: Makefile.cfb,v 1.6 2003/12/21 03:07:01 rtr Exp $
.include <bsd.own.mk>
diff --git a/x11/Xserver/cfb/module/Makefile b/x11/Xserver/cfb/module/Makefile
new file mode 100644
index 00000000000..adec80ede51
--- /dev/null
+++ b/x11/Xserver/cfb/module/Makefile
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+PIXELSIZE= 8
+XMODULEDIR= ${X11ROOTDIR}/lib/modules
+
+.include "../../Makefile.serverlib"
+.include "../Makefile.cfb"
diff --git a/x11/Xserver/cfb16/Makefile b/x11/Xserver/cfb16/Makefile
index c189bd94085..1156d54149b 100644
--- a/x11/Xserver/cfb16/Makefile
+++ b/x11/Xserver/cfb16/Makefile
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
PIXELSIZE= 16
+.include "../Makefile.serverlib"
.include "../cfb/Makefile.cfb"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/cfb16/module/Makefile b/x11/Xserver/cfb16/module/Makefile
new file mode 100644
index 00000000000..3e04cd2e8bc
--- /dev/null
+++ b/x11/Xserver/cfb16/module/Makefile
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+PIXELSIZE= 16
+XMODULEDIR= ${X11ROOTDIR}/lib/modules
+
+.include "../../Makefile.serverlib"
+.include "../../cfb/Makefile.cfb"
diff --git a/x11/Xserver/cfb24/Makefile b/x11/Xserver/cfb24/Makefile
index 778f98cc630..2d4ce04948a 100644
--- a/x11/Xserver/cfb24/Makefile
+++ b/x11/Xserver/cfb24/Makefile
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
PIXELSIZE= 24
+.include "../Makefile.serverlib"
.include "../cfb/Makefile.cfb"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/cfb24/module/Makefile b/x11/Xserver/cfb24/module/Makefile
new file mode 100644
index 00000000000..210582e402d
--- /dev/null
+++ b/x11/Xserver/cfb24/module/Makefile
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+PIXELSIZE= 24
+XMODULEDIR= ${X11ROOTDIR}/lib/modules
+
+.include "../../Makefile.serverlib"
+.include "../../cfb/Makefile.cfb"
diff --git a/x11/Xserver/cfb32/Makefile b/x11/Xserver/cfb32/Makefile
index 9b3a007ba0a..b6a249ee1d3 100644
--- a/x11/Xserver/cfb32/Makefile
+++ b/x11/Xserver/cfb32/Makefile
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
PIXELSIZE= 32
+.include "../Makefile.serverlib"
.include "../cfb/Makefile.cfb"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/cfb32/module/Makefile b/x11/Xserver/cfb32/module/Makefile
new file mode 100644
index 00000000000..8159df3e7b1
--- /dev/null
+++ b/x11/Xserver/cfb32/module/Makefile
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+PIXELSIZE= 32
+XMODULEDIR= ${X11ROOTDIR}/lib/modules
+
+.include "../../Makefile.serverlib"
+.include "../../cfb/Makefile.cfb"
diff --git a/x11/Xserver/dbe/Makefile b/x11/Xserver/dbe/Makefile
index 3c4b9f7cdfe..75632625adf 100644
--- a/x11/Xserver/dbe/Makefile
+++ b/x11/Xserver/dbe/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/09/23 23:21:09 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/21 03:07:01 rtr Exp $
.include "../Makefile.serverlib"
.include "Makefile.dbe"
+.if defined(X11FLAGS.LOADABLE)
SUBDIR= module
.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/fb/Makefile b/x11/Xserver/fb/Makefile
index a7cc364846a..75e9e278e4d 100644
--- a/x11/Xserver/fb/Makefile
+++ b/x11/Xserver/fb/Makefile
@@ -1,35 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
-
-XMODULEDIR= ${X11ROOTDIR}/lib/modules
+# $NetBSD: Makefile,v 1.4 2003/12/21 03:07:01 rtr Exp $
.include "../Makefile.serverlib"
+.include "Makefile.fb"
-.include <bsd.own.mk>
-
-LIB= fb
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/fb
-
-SRCS= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
- fbbltone.c fbbstore.c fbcmap.c fbcompose.c fbcopy.c \
- fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c \
- fbglyph.c fbimage.c fbline.c fbmodule.c fboverlay.c \
- fbpict.c fbpixmap.c fbpoint.c fbpush.c fbscreen.c \
- fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c \
- fbtrap.c fbutil.c fbwindow.c
-
-XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${XSERVERINCDIR} \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext
-
-.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
-.include <bsd.lib.mk>
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/fb/Makefile.fb b/x11/Xserver/fb/Makefile.fb
new file mode 100644
index 00000000000..6a9aebb4dfd
--- /dev/null
+++ b/x11/Xserver/fb/Makefile.fb
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.fb,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+.include <bsd.own.mk>
+
+LIB= fb
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/fb
+
+SRCS= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
+ fbbltone.c fbbstore.c fbcmap.c fbcompose.c fbcopy.c \
+ fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c \
+ fbglyph.c fbimage.c fbline.c fbmodule.c fboverlay.c \
+ fbpict.c fbpixmap.c fbpoint.c fbpush.c fbscreen.c \
+ fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c \
+ fbtrap.c fbutil.c fbwindow.c
+
+XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${XSERVERINCDIR} \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext
+
+.include <bsd.x11.mk>
+LIBDIR= ${XMODULEDIR}
+.include <bsd.lib.mk>
diff --git a/x11/Xserver/fb/module/Makefile b/x11/Xserver/fb/module/Makefile
new file mode 100644
index 00000000000..79f99f64cc4
--- /dev/null
+++ b/x11/Xserver/fb/module/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+XMODULEDIR= ${X11USRLIBDIR}/modules
+
+.include "../../Makefile.serverlib"
+.include "../Makefile.fb"
diff --git a/x11/Xserver/mfb/Makefile b/x11/Xserver/mfb/Makefile
index c9d1b1e3d9d..25b33e4adc9 100644
--- a/x11/Xserver/mfb/Makefile
+++ b/x11/Xserver/mfb/Makefile
@@ -1,80 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/09/30 06:41:29 lukem Exp $
-
-XMODULEDIR= ${X11ROOTDIR}/lib/modules
+# $NetBSD: Makefile,v 1.5 2003/12/21 03:07:01 rtr Exp $
.include "../Makefile.serverlib"
+.include "Makefile.mfb"
-.include <bsd.own.mk>
-
-LIB= mfb
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/mfb
-
-SRCS= maskbits.c mfbbitblt.c mfbbltC.c mfbbltCI.c mfbbltG.c \
- mfbbltO.c mfbbltX.c mfbbres.c mfbbresd.c mfbbstore.c \
- mfbclip.c mfbcmap.c mfbfillarc.c mfbfillrct.c \
- mfbfillsp.c mfbfont.c mfbgc.c mfbgetsp.c mfbhrzvert.c \
- mfbigbblak.c mfbigbwht.c mfbimage.c mfbline.c \
- mfbmisc.c mfbmodule.c mfbpablack.c mfbpainv.c \
- mfbpawhite.c mfbpgbblak.c mfbpgbinv.c mfbpgbwht.c \
- mfbpixmap.c mfbplyblack.c mfbplyinv.c mfbplywhite.c \
- mfbpntwin.c mfbpolypnt.c mfbpushpxl.c mfbscrclse.c \
- mfbscrinit.c mfbseg.c mfbsetsp.c mfbteblack.c \
- mfbtewhite.c mfbtileC.c mfbtileG.c mfbwindow.c \
- mfbzerarc.c
-
-BUILDSYMLINKS= mfbline.c mfbseg.c \
- mfbplygblt.c mfbpgbwht.c \
- mfbplygblt.c mfbpgbblak.c \
- mfbplygblt.c mfbpgbinv.c \
- mfbimggblt.c mfbigbwht.c \
- mfbimggblt.c mfbigbblak.c \
- mfbpntarea.c mfbpawhite.c \
- mfbpntarea.c mfbpablack.c \
- mfbpntarea.c mfbpainv.c \
- mfbtegblt.c mfbtewhite.c \
- mfbtegblt.c mfbteblack.c \
- mfbply1rct.c mfbplywhite.c \
- mfbply1rct.c mfbplyblack.c \
- mfbply1rct.c mfbplyinv.c \
- mfbblt.c mfbbltC.c \
- mfbblt.c mfbbltX.c \
- mfbblt.c mfbbltCI.c \
- mfbblt.c mfbbltO.c \
- mfbblt.c mfbbltG.c \
- mfbtile.c mfbtileC.c \
- mfbtile.c mfbtileG.c
-
-XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${XSERVERINCDIR} \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts
-
-CPPFLAGS.mfbseg.c= -DPOLYSEGMENT
-CPPFLAGS.mfbpgbwht.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE
-CPPFLAGS.mfbpgbblak.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK
-CPPFLAGS.mfbpgbinv.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltInvert -DOPEQ=MFB_OPEQ_INVERT
-CPPFLAGS.mfbigbwht.c= -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE
-CPPFLAGS.mfbigbblak.c= -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK
-CPPFLAGS.mfbpawhite.c= -DMFBSOLIDFILLAREA=mfbSolidWhiteArea -DMFBSTIPPLEFILLAREA=mfbStippleWhiteArea -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE
-CPPFLAGS.mfbpablack.c= -DMFBSOLIDFILLAREA=mfbSolidBlackArea -DMFBSTIPPLEFILLAREA=mfbStippleBlackArea -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK
-CPPFLAGS.mfbpainv.c= -DMFBSOLIDFILLAREA=mfbSolidInvertArea -DMFBSTIPPLEFILLAREA=mfbStippleInvertArea -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT
-CPPFLAGS.mfbtewhite.c= -DMFBTEGLYPHBLT=mfbTEGlyphBltWhite -DOP=MFB_OP_WHITE -DCLIPTETEXT=mfbImageGlyphBltWhite
-CPPFLAGS.mfbteblack.c= -DMFBTEGLYPHBLT=mfbTEGlyphBltBlack -DOP=MFB_OP_BLACK -DCLIPTETEXT=mfbImageGlyphBltBlack
-CPPFLAGS.mfbplywhite.c= -DMFBFILLPOLY1RECT=mfbFillPolyWhite -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE
-CPPFLAGS.mfbplyblack.c= -DMFBFILLPOLY1RECT=mfbFillPolyBlack -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK
-CPPFLAGS.mfbplyinv.c= -DMFBFILLPOLY1RECT=mfbFillPolyInvert -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT
-CPPFLAGS.mfbbltC.c= -DMROP=Mcopy
-CPPFLAGS.mfbbltX.c= -DMROP=Mxor
-CPPFLAGS.mfbbltCI.c= -DMROP=McopyInverted
-CPPFLAGS.mfbbltO.c= -DMROP=Mor
-CPPFLAGS.mfbbltG.c= -DMROP=0
-CPPFLAGS.mfbtileC.c= -DMROP=Mcopy
-CPPFLAGS.mfbtileG.c= -DMROP=0
-
-.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
-.include <bsd.lib.mk>
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR= module
+.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/mfb/Makefile.mfb b/x11/Xserver/mfb/Makefile.mfb
new file mode 100644
index 00000000000..7725924ae08
--- /dev/null
+++ b/x11/Xserver/mfb/Makefile.mfb
@@ -0,0 +1,76 @@
+# $NetBSD: Makefile.mfb,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+.include <bsd.own.mk>
+
+LIB= mfb
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/mfb
+
+SRCS= maskbits.c mfbbitblt.c mfbbltC.c mfbbltCI.c mfbbltG.c \
+ mfbbltO.c mfbbltX.c mfbbres.c mfbbresd.c mfbbstore.c \
+ mfbclip.c mfbcmap.c mfbfillarc.c mfbfillrct.c \
+ mfbfillsp.c mfbfont.c mfbgc.c mfbgetsp.c mfbhrzvert.c \
+ mfbigbblak.c mfbigbwht.c mfbimage.c mfbline.c \
+ mfbmisc.c mfbmodule.c mfbpablack.c mfbpainv.c \
+ mfbpawhite.c mfbpgbblak.c mfbpgbinv.c mfbpgbwht.c \
+ mfbpixmap.c mfbplyblack.c mfbplyinv.c mfbplywhite.c \
+ mfbpntwin.c mfbpolypnt.c mfbpushpxl.c mfbscrclse.c \
+ mfbscrinit.c mfbseg.c mfbsetsp.c mfbteblack.c \
+ mfbtewhite.c mfbtileC.c mfbtileG.c mfbwindow.c \
+ mfbzerarc.c
+
+BUILDSYMLINKS= mfbline.c mfbseg.c \
+ mfbplygblt.c mfbpgbwht.c \
+ mfbplygblt.c mfbpgbblak.c \
+ mfbplygblt.c mfbpgbinv.c \
+ mfbimggblt.c mfbigbwht.c \
+ mfbimggblt.c mfbigbblak.c \
+ mfbpntarea.c mfbpawhite.c \
+ mfbpntarea.c mfbpablack.c \
+ mfbpntarea.c mfbpainv.c \
+ mfbtegblt.c mfbtewhite.c \
+ mfbtegblt.c mfbteblack.c \
+ mfbply1rct.c mfbplywhite.c \
+ mfbply1rct.c mfbplyblack.c \
+ mfbply1rct.c mfbplyinv.c \
+ mfbblt.c mfbbltC.c \
+ mfbblt.c mfbbltX.c \
+ mfbblt.c mfbbltCI.c \
+ mfbblt.c mfbbltO.c \
+ mfbblt.c mfbbltG.c \
+ mfbtile.c mfbtileC.c \
+ mfbtile.c mfbtileG.c
+
+XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${XSERVERINCDIR} \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts
+
+CPPFLAGS.mfbseg.c= -DPOLYSEGMENT
+CPPFLAGS.mfbpgbwht.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE
+CPPFLAGS.mfbpgbblak.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK
+CPPFLAGS.mfbpgbinv.c= -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltInvert -DOPEQ=MFB_OPEQ_INVERT
+CPPFLAGS.mfbigbwht.c= -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE
+CPPFLAGS.mfbigbblak.c= -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK
+CPPFLAGS.mfbpawhite.c= -DMFBSOLIDFILLAREA=mfbSolidWhiteArea -DMFBSTIPPLEFILLAREA=mfbStippleWhiteArea -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE
+CPPFLAGS.mfbpablack.c= -DMFBSOLIDFILLAREA=mfbSolidBlackArea -DMFBSTIPPLEFILLAREA=mfbStippleBlackArea -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK
+CPPFLAGS.mfbpainv.c= -DMFBSOLIDFILLAREA=mfbSolidInvertArea -DMFBSTIPPLEFILLAREA=mfbStippleInvertArea -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT
+CPPFLAGS.mfbtewhite.c= -DMFBTEGLYPHBLT=mfbTEGlyphBltWhite -DOP=MFB_OP_WHITE -DCLIPTETEXT=mfbImageGlyphBltWhite
+CPPFLAGS.mfbteblack.c= -DMFBTEGLYPHBLT=mfbTEGlyphBltBlack -DOP=MFB_OP_BLACK -DCLIPTETEXT=mfbImageGlyphBltBlack
+CPPFLAGS.mfbplywhite.c= -DMFBFILLPOLY1RECT=mfbFillPolyWhite -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE
+CPPFLAGS.mfbplyblack.c= -DMFBFILLPOLY1RECT=mfbFillPolyBlack -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK
+CPPFLAGS.mfbplyinv.c= -DMFBFILLPOLY1RECT=mfbFillPolyInvert -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT
+CPPFLAGS.mfbbltC.c= -DMROP=Mcopy
+CPPFLAGS.mfbbltX.c= -DMROP=Mxor
+CPPFLAGS.mfbbltCI.c= -DMROP=McopyInverted
+CPPFLAGS.mfbbltO.c= -DMROP=Mor
+CPPFLAGS.mfbbltG.c= -DMROP=0
+CPPFLAGS.mfbtileC.c= -DMROP=Mcopy
+CPPFLAGS.mfbtileG.c= -DMROP=0
+
+.include <bsd.x11.mk>
+LIBDIR= ${XMODULEDIR}
+.include <bsd.lib.mk>
diff --git a/x11/Xserver/mfb/module/Makefile b/x11/Xserver/mfb/module/Makefile
new file mode 100644
index 00000000000..1e9ce2ad665
--- /dev/null
+++ b/x11/Xserver/mfb/module/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2003/12/21 03:07:01 rtr Exp $
+
+XMODULEDIR= ${X11USRLIBDIR}/modules
+
+.include "../../Makefile.serverlib"
+.include "../Makefile.mfb"
diff --git a/x11/Xserver/record/Makefile b/x11/Xserver/record/Makefile
index ac3e5d60298..1debf78a594 100644
--- a/x11/Xserver/record/Makefile
+++ b/x11/Xserver/record/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/09/23 23:21:15 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/21 03:07:01 rtr Exp $
.include "../Makefile.serverlib"
.include "Makefile.record"
+.if defined(X11FLAGS.LOADABLE)
SUBDIR= module
.include <bsd.subdir.mk>
+.endif
diff --git a/x11/Xserver/xtrap/Makefile b/x11/Xserver/xtrap/Makefile
index 8aa0b25e2d4..802bf6f705c 100644
--- a/x11/Xserver/xtrap/Makefile
+++ b/x11/Xserver/xtrap/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/09/23 23:21:17 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/21 03:07:01 rtr Exp $
.include "../Makefile.serverlib"
.include "Makefile.xtrap"
+.if defined(X11FLAGS.LOADABLE)
SUBDIR= module
.include <bsd.subdir.mk>
+.endif