Create buildlink.mk files for the various Xaw libraries. Instead of

USE_XAW, a package Makefile may just include mk/xaw.buildlink.mk, which
pulls in the correct buildlink.mk file depending on the value of XAW_TYPE.
A package Makefile may also rely on LIBXAW being set to the correct
libraries.

3 files changed, 69 insertions, 1 deletions

diff --git a/mk/xaw.buildlink.mk b/mk/xaw.buildlink.mk
new file mode 100644
index 00000000000..df4bbc17806
--- /dev/null
+++ b/mk/xaw.buildlink.mk
@@ -0,0 +1,26 @@
+# $NetBSD: xaw.buildlink.mk,v 1.1 2001/08/23 04:24:21 jlam Exp $
+#
+# This Makefile fragment is included by packages that use Xaw.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally set XAW_TYPE to the Xaw library desired, and
+# (2) Include this Makefile fragment in the package Makefile.
+
+.if !defined(XAW_BUILDLINK_MK)
+XAW_BUILDLINK_MK=	# defined
+
+# Pull in setting for XAW_TYPE.
+XAW_TYPE?=	standard
+.include "../../mk/bsd.prefs.mk"
+
+.if ${XAW_TYPE} == "xpm"
+.include "../../x11/Xaw-Xpm/buildlink.mk"
+.elif ${XAW_TYPE} == "3d"
+.include "../../x11/Xaw3d/buildlink.mk"
+.else
+LIBXAW?=	-L${BUILDLINK_X11_DIR}/lib -lXaw
+MAKE_ENV+=	LIBXAW="${LIBXAW}"
+.endif
+
+.endif	# XAW_BUILDLINK_MK
diff --git a/x11/Xaw-Xpm/buildlink.mk b/x11/Xaw-Xpm/buildlink.mk
new file mode 100644
index 00000000000..a952dd5b2ae
--- /dev/null
+++ b/x11/Xaw-Xpm/buildlink.mk
@@ -0,0 +1,39 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/08/23 04:24:22 jlam Exp $
+#
+# This Makefile fragment is included by packages that use Xaw-Xpm.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.Xaw-Xpm to the dependency pattern
+#     for the version of Xaw-Xpm desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(XAWXPM_BUILDLINK_MK)
+XAWXPM_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.Xaw-Xpm?=	Xaw-Xpm-1.1
+DEPENDS+=	${BUILDLINK_DEPENDS.Xaw-Xpm}:../../x11/Xaw-Xpm
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.Xaw-Xpm=Xaw-Xpm
+BUILDLINK_PREFIX.Xaw-Xpm_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.Xaw-Xpm=	include/X11/Xaw3d/*
+BUILDLINK_FILES.Xaw-Xpm+=	lib/libXaw3d.*
+
+.include "../../graphics/xpm/buildlink.mk"
+
+BUILDLINK_TARGETS.Xaw-Xpm+=	Xaw-Xpm-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.Xaw-Xpm}
+
+LIBXAW?=	-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib -lXaw3d -lXpm
+MAKE_ENV+=	LIBXAW="${LIBXAW}"
+
+pre-configure: ${BUILDLINK_TARGETS.Xaw-Xpm}
+Xaw-Xpm-buildlink: _BUILDLINK_USE
+
+.endif	# XAWXPM_BUILDLINK_MK
diff --git a/x11/Xaw3d/buildlink.mk b/x11/Xaw3d/buildlink.mk
index 1d2b5c314d3..fee54f55b31 100644
--- a/x11/Xaw3d/buildlink.mk
+++ b/x11/Xaw3d/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/09 20:08:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/23 04:24:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Xaw3d.
 #
@@ -29,6 +29,9 @@ BUILDLINK_FILES.Xaw3d+=		lib/libXaw3d.*
 BUILDLINK_TARGETS.Xaw3d+=	Xaw3d-buildlink
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.Xaw3d}
 
+LIBXAW?=	-L${BUILDLINK_DIR}/lib -lXaw3d
+MAKE_ENV+=	LIBXAW="${LIBXAW}"
+
 pre-configure: ${BUILDLINK_TARGETS.Xaw3d}
 Xaw3d-buildlink: _BUILDLINK_USE