summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/motif.buildlink2.mk20
-rw-r--r--mk/ossaudio.buildlink2.mk8
-rw-r--r--mk/pthread.buildlink2.mk3
-rw-r--r--mk/xaw.buildlink2.mk9
4 files changed, 12 insertions, 28 deletions
diff --git a/mk/motif.buildlink2.mk b/mk/motif.buildlink2.mk
index fd60f469d53..2bb4182cfa6 100644
--- a/mk/motif.buildlink2.mk
+++ b/mk/motif.buildlink2.mk
@@ -1,16 +1,15 @@
-# $NetBSD: motif.buildlink2.mk,v 1.1.2.1 2002/05/08 16:07:30 jlam Exp $
+# $NetBSD: motif.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
#
-# This Makefile fragment is included by packages that use Motif.
+# USE_MOTIF12
+# use a Motif-1.2-compatible installation, otherwise, assume
+# we want a Motif-2.0-compatible installation
#
-# To use this Makefile fragment, simply:
+# MOTIFBASE, MOTIF12BASE
+# choose the Motif-2.0 or Motif-1.2-compatible installation at the
+# named location
#
-# (1) Optionally set USE_MOTIF12 to use a Motif-1.2-compatible installation.
-# Otherwise, assume we want a Motif-2.0-compatible installation.
-# (2) Optionally set MOTIFBASE or MOTIF12BASE to choose the Motif-2.0 or
-# Motif-1.2-compatible installation at the named location,
-# (3) Or optionally set MOTIF_TYPE or MOTIF12_TYPE to choose a specific
-# Motif-2.0 or Motif-1.2-compatible package to be used,
-# (4) And include this Makefile fragment in the package Makefile.
+# MOTIF_TYPE, MOTIF12_TYPE
+# choose a specific Motif-2.0 or Motif-1.2-compatible package.
.if !defined(MOTIF_BUILDLINK2_MK)
MOTIF_BUILDLINK2_MK= # defined
@@ -123,7 +122,6 @@ _MOTIFBASE= ${BUILDLINK_PREFIX.lesstif12}
# Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into
# ${BUILDLINK_DIR}.
#
-. include "../../mk/bsd.buildlink2.mk"
BUILDLINK_PREFIX.motif= ${_MOTIFBASE}
BUILDLINK_FILES.motif= include/Mrm/*
BUILDLINK_FILES.motif+= include/Xm/*
diff --git a/mk/ossaudio.buildlink2.mk b/mk/ossaudio.buildlink2.mk
index 583958a5b75..b6af5c95175 100644
--- a/mk/ossaudio.buildlink2.mk
+++ b/mk/ossaudio.buildlink2.mk
@@ -1,15 +1,9 @@
-# $NetBSD: ossaudio.buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:18 jlam Exp $
-#
-# This Makefile fragment is included by packages that use OSS audio.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: ossaudio.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
.if !defined(OSSAUDIO_BUILDLINK2_MK)
OSSAUDIO_BUILDLINK2_MK= # defined
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
.if ${_OPSYS_HAS_OSSAUDIO} == "yes"
BUILDLINK_PREFIX.ossaudio= /usr
diff --git a/mk/pthread.buildlink2.mk b/mk/pthread.buildlink2.mk
index 45653896362..cda2bceee5c 100644
--- a/mk/pthread.buildlink2.mk
+++ b/mk/pthread.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink2.mk,v 1.1.2.1 2002/05/08 16:07:28 jlam Exp $
+# $NetBSD: pthread.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
#
# This Makefile fragment is included by packages that use pthreads.
# This Makefile fragment is also included directly by bsd.prefs.mk.
@@ -72,7 +72,6 @@ PTHREAD_BUILDLINK2_MK= # defined
#
# Link the native pthread libraries and headers into ${BUILDLINK_DIR}.
#
-. include "../../mk/bsd.buildlink2.mk"
BUILDLINK_PREFIX.pthread= /usr
BUILDLINK_FILES.pthread= include/pthread.h
BUILDLINK_FILES.pthread+= lib/libpthread.*
diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk
index bf352cbcc36..4b4c735db26 100644
--- a/mk/xaw.buildlink2.mk
+++ b/mk/xaw.buildlink2.mk
@@ -1,11 +1,4 @@
-# $NetBSD: xaw.buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:44 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.
+# $NetBSD: xaw.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
.if !defined(XAW_BUILDLINK2_MK)
XAW_BUILDLINK2_MK= # defined