diff options
author | jlam <jlam> | 2002-09-23 02:28:36 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-23 02:28:36 +0000 |
commit | 6dd92dde3c6048c30cc3edb622b623c9ab43da7e (patch) | |
tree | 7ac3618e33c321d755fe47402f01bfe3d298ac56 /devel | |
parent | e814b2094b0371d4dcdf31fabd1b562d263822e0 (diff) | |
download | pkgsrc-6dd92dde3c6048c30cc3edb622b623c9ab43da7e.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 'devel')
-rw-r--r-- | devel/bonobo/buildlink2.mk | 5 | ||||
-rw-r--r-- | devel/glib2/buildlink2.mk | 4 | ||||
-rw-r--r-- | devel/libglade/buildlink2.mk | 7 | ||||
-rw-r--r-- | devel/libglade2/buildlink2.mk | 7 | ||||
-rw-r--r-- | devel/ptl2/buildlink2.mk | 4 |
5 files changed, 18 insertions, 9 deletions
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk index 7ccda482999..fbb01b0bffc 100644 --- a/devel/bonobo/buildlink2.mk +++ b/devel/bonobo/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:36 jlam Exp $ .if !defined(BONOBO_BUILDLINK2_MK) BONOBO_BUILDLINK2_MK= # defined @@ -19,7 +19,8 @@ BUILDLINK_FILES.bonobo+= lib/libbonobo-print.* BUILDLINK_FILES.bonobo+= lib/libefs.* BUILDLINK_FILES.bonobo+= share/idl/Bonobo*.idl -CPPFLAGS+= -I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0 +BUILDLINK_CPPFLAGS.bonobo= -I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0 +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.bonobo} .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk index 1205a08c234..606f196a16b 100644 --- a/devel/glib2/buildlink2.mk +++ b/devel/glib2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2002/09/11 11:24:40 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2002/09/23 02:28:37 jlam Exp $ .if !defined(GLIB2_BUILDLINK2_MK) GLIB2_BUILDLINK2_MK= # defined @@ -26,8 +26,8 @@ PTHREAD_OPTS+= native .include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CPPFLAGS+= -I${BUILDLINK_PREFIX.ptl2}/PTL/include . include "../../devel/ptl2/buildlink2.mk" +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.ptl2} .endif BUILDLINK_TARGETS+= glib2-buildlink diff --git a/devel/libglade/buildlink2.mk b/devel/libglade/buildlink2.mk index 8942a263a0a..15dd3300598 100644 --- a/devel/libglade/buildlink2.mk +++ b/devel/libglade/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2002/09/22 09:43:16 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 02:28:37 jlam Exp $ .if !defined(LIBGLADE_BUILDLINK2_MK) LIBGLADE_BUILDLINK2_MK= # defined @@ -13,7 +13,10 @@ BUILDLINK_FILES.libglade= include/libglade-1.0/glade/* BUILDLINK_FILES.libglade+= lib/libglade.* BUILDLINK_FILES.libglade+= lib/libglade-gnome.* -CPPFLAGS+= -I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0 +BUILDLINK_CPPFLAGS.libglade= \ + -I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0 + +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libglade} .include "../../audio/esound/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk index 08a350b9e17..38cf2325ac9 100644 --- a/devel/libglade2/buildlink2.mk +++ b/devel/libglade2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 09:52:35 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 02:28:38 jlam Exp $ .if !defined(LIBGLADE2_BUILDLINK2_MK) LIBGLADE2_BUILDLINK2_MK= # defined @@ -12,7 +12,10 @@ BUILDLINK_PREFIX.libglade2_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.libglade2= include/libglade-2.0/glade/* BUILDLINK_FILES.libglade2+= lib/libglade-2.0.* -CPPFLAGS+= -I${BUILDLINK_DIR}/include/libglade-2.0 +BUILDLINK_CPPFLAGS.libglade2= \ + -I${BUILDLINK_PREFIX.libglade2}/include/libglade-2.0 + +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libglade2} .include "../../textproc/libxml2/buildlink2.mk" .include "../../x11/gtk2/buildlink2.mk" diff --git a/devel/ptl2/buildlink2.mk b/devel/ptl2/buildlink2.mk index 7d9b67d610f..70807285707 100644 --- a/devel/ptl2/buildlink2.mk +++ b/devel/ptl2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $ .if !defined(PTL2_BUILDLINK2_MK) PTL2_BUILDLINK2_MK= # defined @@ -14,6 +14,8 @@ BUILDLINK_FILES.ptl2+= PTL/include/*/*.h BUILDLINK_FILES.ptl2+= PTL/include/*.h BUILDLINK_FILES.ptl2+= lib/libPTL.* +BUILDLINK_CPPFLAGS.ptl2= -I${BUILDLINK_PREFIX.ptl2}/PTL/include + BUILDLINK_TARGETS+= ptl2-buildlink ptl2-buildlink: _BUILDLINK_USE |