diff options
| -rw-r--r-- | mk/xaw.buildlink2.mk | 15 | ||||
| -rw-r--r-- | x11/Xaw-Xpm/buildlink2.mk | 7 | ||||
| -rw-r--r-- | x11/Xaw3d/buildlink2.mk | 6 | ||||
| -rw-r--r-- | x11/neXtaw/buildlink2.mk | 7 |
4 files changed, 23 insertions, 12 deletions
diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk index 7ede0a4fc64..ed064c742bc 100644 --- a/mk/xaw.buildlink2.mk +++ b/mk/xaw.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink2.mk,v 1.3 2002/08/28 15:20:39 jlam Exp $ +# $NetBSD: xaw.buildlink2.mk,v 1.4 2002/09/23 08:29:56 jlam Exp $ .if !defined(XAW_BUILDLINK2_MK) XAW_BUILDLINK2_MK= # defined @@ -9,14 +9,19 @@ XAW_TYPE?= standard .include "../../mk/bsd.prefs.mk" .if ${XAW_TYPE} == "xpm" -.include "../../x11/Xaw-Xpm/buildlink2.mk" +. include "../../x11/Xaw-Xpm/buildlink2.mk" +BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw-Xpm} .elif ${XAW_TYPE} == "3d" -.include "../../x11/Xaw3d/buildlink2.mk" +. include "../../x11/Xaw3d/buildlink2.mk" +BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d} .elif ${XAW_TYPE} == "neXtaw" -.include "../../x11/neXtaw/buildlink2.mk" +. include "../../x11/neXtaw/buildlink2.mk" +BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} .else -LIBXAW?= -L${X11BASE}/lib -lXaw +BUILDLINK_PREFIX.Xaw?= ${X11BASE} +LIBXAW?= -L${X11BASE}/lib -Wl,-R${X11BASE} -lXaw .endif + MAKE_ENV+= LIBXAW="${LIBXAW}" .endif # XAW_BUILDLINK2_MK diff --git a/x11/Xaw-Xpm/buildlink2.mk b/x11/Xaw-Xpm/buildlink2.mk index 8aaaac7e5c9..7c28b6e8038 100644 --- a/x11/Xaw-Xpm/buildlink2.mk +++ b/x11/Xaw-Xpm/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:58 jlam Exp $ .if !defined(XAWXPM_BUILDLINK2_MK) XAWXPM_BUILDLINK2_MK= # defined @@ -17,7 +17,10 @@ BUILDLINK_FILES.Xaw-Xpm+= lib/libXaw3d.* BUILDLINK_TARGETS+= Xaw-Xpm-buildlink LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - -L${BUILDLINK_PREFIX.xpm}/lib -lXaw3d -lXpm + -Wl,-R${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ + -L${BUILDLINK_PREFIX.xpm}/lib \ + -Wl,-R${BUILDLINK_PREFIX.xpm}/lib \ + -lXaw3d -lXpm Xaw-Xpm-buildlink: _BUILDLINK_USE diff --git a/x11/Xaw3d/buildlink2.mk b/x11/Xaw3d/buildlink2.mk index 94d4e7178c6..41205f498c1 100644 --- a/x11/Xaw3d/buildlink2.mk +++ b/x11/Xaw3d/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:59 jlam Exp $ .if !defined(XAW3D_BUILDLINK2_MK) XAW3D_BUILDLINK2_MK= # defined @@ -15,7 +15,9 @@ BUILDLINK_FILES.Xaw3d+= lib/libXaw3d.* BUILDLINK_TARGETS+= Xaw3d-buildlink -LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib -lXaw3d +LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ + -Wl,-R${BUILDLINK_PREFIX.Xaw3d}/lib \ + -lXaw3d Xaw3d-buildlink: _BUILDLINK_USE diff --git a/x11/neXtaw/buildlink2.mk b/x11/neXtaw/buildlink2.mk index 72721b1f5ce..e4eb2a0fd71 100644 --- a/x11/neXtaw/buildlink2.mk +++ b/x11/neXtaw/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/08/28 15:11:21 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2002/09/23 08:29:59 jlam Exp $ .if !defined(NEXTAW_BUILDLINK2_MK) NEXTAW_BUILDLINK2_MK= # defined @@ -14,8 +14,9 @@ BUILDLINK_FILES.neXtaw+= lib/libneXtaw.* BUILDLINK_TARGETS+= neXtaw-buildlink -LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib -lneXtaw -MAKE_ENV+= LIBXAW="${LIBXAW}" +LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ + -Wl,-R${BUILDLINK_PREFIX.neXtaw}/lib \ + -lneXtaw neXtaw-buildlink: _BUILDLINK_USE |