Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/x11/Xserver Separate loadable modules
details: https://anonhg.NetBSD.org/src/rev/739129622638
branches: trunk
changeset: 556576:739129622638
user: rtr <rtr%NetBSD.org@localhost>
date: Sun Dec 21 03:07:01 2003 +0000
description:
Separate loadable modules
Don't build or install modules for non-loadable xservers
diffstat:
x11/Xserver/GL/GLcore/Makefile | 82 ++--------------------------------
x11/Xserver/GL/GLcore/Makefile.GLcore | 75 +++++++++++++++++++++++++++++++
x11/Xserver/GL/GLcore/module/Makefile | 12 +++++
x11/Xserver/GL/glx/Makefile | 4 +-
x11/Xserver/Makefile.serverlib | 6 ++-
x11/Xserver/Xext/Makefile | 11 +++-
x11/Xserver/Xext/Makefile.ext | 4 +-
x11/Xserver/Xext/ext/Makefile | 13 +++-
x11/Xserver/Xext/extmod/Makefile | 3 +-
x11/Xserver/Xext/exts/Makefile | 3 +-
x11/Xserver/cfb/Makefile | 8 ++-
x11/Xserver/cfb/Makefile.cfb | 6 +--
x11/Xserver/cfb/module/Makefile | 7 ++
x11/Xserver/cfb16/Makefile | 8 ++-
x11/Xserver/cfb16/module/Makefile | 7 ++
x11/Xserver/cfb24/Makefile | 8 ++-
x11/Xserver/cfb24/module/Makefile | 7 ++
x11/Xserver/cfb32/Makefile | 8 ++-
x11/Xserver/cfb32/module/Makefile | 7 ++
x11/Xserver/dbe/Makefile | 4 +-
x11/Xserver/fb/Makefile | 38 ++-------------
x11/Xserver/fb/Makefile.fb | 31 +++++++++++++
x11/Xserver/fb/module/Makefile | 6 ++
x11/Xserver/mfb/Makefile | 83 ++--------------------------------
x11/Xserver/mfb/Makefile.mfb | 76 ++++++++++++++++++++++++++++++++
x11/Xserver/mfb/module/Makefile | 6 ++
x11/Xserver/record/Makefile | 4 +-
x11/Xserver/xtrap/Makefile | 4 +-
28 files changed, 321 insertions(+), 210 deletions(-)
diffs (truncated from 735 to 300 lines):
diff -r 50f463e40f5a -r 739129622638 x11/Xserver/GL/GLcore/Makefile
--- a/x11/Xserver/GL/GLcore/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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 <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
+.include "Makefile.GLcore"
-.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 -r 50f463e40f5a -r 739129622638 x11/Xserver/GL/GLcore/Makefile.GLcore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile.GLcore Sun Dec 21 03:07:01 2003 +0000
@@ -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 -r 50f463e40f5a -r 739129622638 x11/Xserver/GL/GLcore/module/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/GL/GLcore/module/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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 -r 50f463e40f5a -r 739129622638 x11/Xserver/GL/glx/Makefile
--- a/x11/Xserver/GL/glx/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/GL/glx/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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 -r 50f463e40f5a -r 739129622638 x11/Xserver/Makefile.serverlib
--- a/x11/Xserver/Makefile.serverlib Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Makefile.serverlib Sun Dec 21 03:07:01 2003 +0000
@@ -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 @@
.endif
CPPFLAGS+= ${X11FLAGS.SERVER}
+
+.if defined(XMODULEDIR)
+CPPFLAGS+= ${X11FLAGS.LOADABLE}
+.endif
diff -r 50f463e40f5a -r 739129622638 x11/Xserver/Xext/Makefile
--- a/x11/Xserver/Xext/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Xext/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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
-SUBDIR= ext exts extmod
+.include "../Makefile.serverlib"
+.include "Makefile.ext"
+
+.if defined(X11FLAGS.LOADABLE)
+SUBDIR+= extmod
+.endif
.include <bsd.subdir.mk>
diff -r 50f463e40f5a -r 739129622638 x11/Xserver/Xext/Makefile.ext
--- a/x11/Xserver/Xext/Makefile.ext Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Xext/Makefile.ext Sun Dec 21 03:07:01 2003 +0000
@@ -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 -r 50f463e40f5a -r 739129622638 x11/Xserver/Xext/ext/Makefile
--- a/x11/Xserver/Xext/ext/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Xext/ext/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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 -r 50f463e40f5a -r 739129622638 x11/Xserver/Xext/extmod/Makefile
--- a/x11/Xserver/Xext/extmod/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Xext/extmod/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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 @@
XMODULEDIR= ${X11ROOTDIR}/lib/modules/extensions
+.include "../../Makefile.serverlib"
.include "../Makefile.ext"
.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext/extmod
diff -r 50f463e40f5a -r 739129622638 x11/Xserver/Xext/exts/Makefile
--- a/x11/Xserver/Xext/exts/Makefile Sun Dec 21 02:52:02 2003 +0000
+++ b/x11/Xserver/Xext/exts/Makefile Sun Dec 21 03:07:01 2003 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index