[src/trunk]: src/x11/Xserver/Xfont Don't build as fontmodules or install if X...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a48c01d9ea20
branches:  trunk
changeset: 559375:a48c01d9ea20
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 16 17:40:53 2004 +0000

description:
Don't build as fontmodules or install if X11FLAGS.LOADABLE is empty.

diffstat:

 x11/Xserver/Xfont/bitmap/Makefile   |  11 +++++++++--
 x11/Xserver/Xfont/freetype/Makefile |  11 +++++++++--
 x11/Xserver/Xfont/speedo/Makefile   |  11 ++++++++---
 x11/Xserver/Xfont/type1/Makefile    |  11 +++++++++--
 x11/Xserver/Xfont/xtt/Makefile      |  13 ++++++++++---
 x11/Xserver/Xfont/xtt/Makefile.xtt  |  11 ++++++++---
 6 files changed, 53 insertions(+), 15 deletions(-)

diffs (162 lines):

diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/bitmap/Makefile
--- a/x11/Xserver/Xfont/bitmap/Makefile Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/bitmap/Makefile Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2004/03/16 17:40:53 matt Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/fonts
 
@@ -17,10 +17,17 @@
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR}
 
-CPPFLAGS+=     -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DFONTMODULE
+CPPFLAGS+=     -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT
 
 CPPFLAGS.bitmapfunc.c= -DX_GZIP_FONT_COMPRESSION
 
 .include <bsd.x11.mk>
+
+.if !empty(X11FLAGS.LOADABLE)
+CPPFLAGS+=     -DFONTMODULE
 LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
+
 .include <bsd.lib.mk>
diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/freetype/Makefile
--- a/x11/Xserver/Xfont/freetype/Makefile       Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/freetype/Makefile       Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/06 03:31:06 rtr Exp $
+#      $NetBSD: Makefile,v 1.4 2004/03/16 17:40:53 matt Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts
 
@@ -77,8 +77,15 @@
                -I${FT2SRC}/pcf \
                -I${XSERVERINCDIR}
 
-CPPFLAGS+=     -DFONTMODULE -DXFREE86_FT2
+CPPFLAGS+=     -DXFREE86_FT2
 
 .include <bsd.x11.mk>
+
+.if !empty(X11FLAGS.LOADABLE)
+CPPFLAGS+=     -DFONTMODULE
 LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
+
 .include <bsd.lib.mk>
diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/speedo/Makefile
--- a/x11/Xserver/Xfont/speedo/Makefile Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/speedo/Makefile Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2004/03/16 17:40:54 matt Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/fonts
 
@@ -18,8 +18,13 @@
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${XSERVERINCDIR}
 
+.include <bsd.x11.mk>
+
+.if !empty(X11FLAGS.LOADABLE)
 CPPFLAGS+=     -DFONTMODULE
+LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
                
-.include <bsd.x11.mk>
-LIBDIR=        ${XMODULEDIR}
 .include <bsd.lib.mk>
diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/type1/Makefile
--- a/x11/Xserver/Xfont/type1/Makefile  Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/type1/Makefile  Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2004/03/16 17:40:54 matt Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts
 
@@ -19,8 +19,15 @@
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR}
 
-CPPFLAGS+=     -DBUILDCID -DHAVE_CFM -DUSE_MMAP -DFONTMODULE
+CPPFLAGS+=     -DBUILDCID -DHAVE_CFM -DUSE_MMAP
 
 .include <bsd.x11.mk>
+
+.if !empty(X11FLAGS.LOADABLE)
+CPPFLAGS+=     -DFONTMODULE
 LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
+
 .include <bsd.lib.mk>
diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/xtt/Makefile
--- a/x11/Xserver/Xfont/xtt/Makefile    Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/xtt/Makefile    Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/06 03:31:06 rtr Exp $
+#      $NetBSD: Makefile,v 1.4 2004/03/16 17:40:54 matt Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/fonts
 
@@ -29,12 +29,19 @@
 
 CPPFLAGS+=     -DTT_MAKE_OPTION_SINGLE_OBJECT=1 \
                -DTT_CONFIG_OPTION_EXTEND_ENGINE \
-               -DFONTMODULE -DCCONV_MODULE \
-               -DCCONV_MODULE_DIR=\"/usr/X11R6/lib/modules/codeconv\" \
                -DOPT_ENCODINGS
 
 .include <bsd.x11.mk>
+
+.if !empty(X11FLAGS.LOADABLE)
+CPPFLAGS+=     -DFONTMODULE \
+               -DCCONV_MODULE \
+               -DCCONV_MODULE_DIR=\"/usr/X11R6/lib/modules/codeconv\"
 LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
+
 .include <bsd.lib.mk>
 
 SUBDIR=        ARABIC BIG5HKSCS GBK ISO8859_10 ISO8859_15 ISO8859_4 ISO8859_7 \
diff -r 2af35311bdfe -r a48c01d9ea20 x11/Xserver/Xfont/xtt/Makefile.xtt
--- a/x11/Xserver/Xfont/xtt/Makefile.xtt        Tue Mar 16 17:40:02 2004 +0000
+++ b/x11/Xserver/Xfont/xtt/Makefile.xtt        Tue Mar 16 17:40:53 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xtt,v 1.1 2004/03/03 08:38:09 rtr Exp $
+#      $NetBSD: Makefile.xtt,v 1.2 2004/03/16 17:40:54 matt Exp $
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/fonts/codeconv \
                -I${X11SRCDIR.xc}/extras/FreeType/lib \
@@ -8,9 +8,14 @@
                -I${X11SRCDIR.xc}/include \
                -I${XSERVERINCDIR}
 
-CPPFLAGS+=     -DFONTMODULE -DMODNAME=${LIB}
+.include <bsd.x11.mk>
 
-.include <bsd.x11.mk>
+.if !empty(X11FLAGS.LOADABLE)
+CPPFLAGS+=     -DFONTMODULE -DMODNAME=${LIB}
 LIBDIR=        ${XMODULEDIR}
+.else
+libinstall::
+.endif
+
 .include <bsd.lib.mk>