diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-23 02:28:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-23 02:28:36 +0000 |
| commit | 011e4075f86c21fa43c9c8550497024a4e5643ee (patch) | |
| tree | 7ac3618e33c321d755fe47402f01bfe3d298ac56 /x11 | |
| parent | 85df4a1fdc701e44257bc25197f7bd05624475a7 (diff) | |
| download | pkgsrc-011e4075f86c21fa43c9c8550497024a4e5643ee.tar.gz | |
Use BUILDLINK_CPPFLAGS.<pkg> and BUILDLINK_LDFLAGS.<pkg> as standard names
for the extra CPPFLAGS and LDFLAGS needed by packages that include these
buildlink2.mk files.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fox/buildlink2.mk | 5 | ||||
| -rw-r--r-- | x11/wx1Motif/buildlink2.mk | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/x11/fox/buildlink2.mk b/x11/fox/buildlink2.mk index cf12732e8a1..6aa1f31a098 100644 --- a/x11/fox/buildlink2.mk +++ b/x11/fox/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:27 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $ .if !defined(FOX_BUILDLINK2_MK) FOX_BUILDLINK2_MK= # defined @@ -13,7 +13,8 @@ BUILDLINK_FILES.fox= include/fox/* BUILDLINK_FILES.fox+= lib/libFOX-* BUILDLINK_FILES.fox+= lib/libFOX.* -CPPFLAGS+= -I${BUILDLINK_PREFIX.fox}/include/fox +BUILDLINK_CPPFLAGS.fox+= -I${BUILDLINK_PREFIX.fox}/include/fox +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.fox} BUILDLINK_TARGETS+= fox-buildlink diff --git a/x11/wx1Motif/buildlink2.mk b/x11/wx1Motif/buildlink2.mk index 78846b21c4e..e5b4e0e9984 100644 --- a/x11/wx1Motif/buildlink2.mk +++ b/x11/wx1Motif/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:59 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:39 jlam Exp $ .if !defined(WX1MOTIF_BUILDLINK2_MK) WX1MOTIF_BUILDLINK2_MK= # defined @@ -13,13 +13,15 @@ BUILDLINK_PREFIX.wx1Motif_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.wx1Motif= include/wxwindows1/* BUILDLINK_FILES.wx1Motif+= lib/wxwindows1/libwx_motif.a -WX1MOTIF_CPPFLAGS= -I${BUILDLINK_PREFIX.wx1Motif}/include/wxwindows1 -WX1MOTIF_LDFLAGS= -L${BUILDLINK_PREFIX.wx1Motif}/lib/wxwindows1 +BUILDLINK_CPPFLAGS.wx1Motif= \ + -I${BUILDLINK_PREFIX.wx1Motif}/include/wxwindows1 +BUILDLINK_LDFLAGS.wx1Motif= \ + -L${BUILDLINK_PREFIX.wx1Motif}/lib/wxwindows1 -CFLAGS+= ${WX1MOTIF_CPPFLAGS} -CXXFLAGS+= ${WX1MOTIF_CPPFLAGS} -CPPFLAGS+= ${WX1MOTIF_CPPFLAGS} -LDFLAGS+= ${WX1MOTIF_LDFLAGS} +CFLAGS+= ${BUILDLINK_CPPFLAGS.wx1Motif} +CXXFLAGS+= ${BUILDLINK_CPPFLAGS.wx1Motif} +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.wx1Motif} +LDFLAGS+= ${BUILDLINK_LDFLAGS.wx1Motif} .include "../../mk/motif.buildlink2.mk" |