diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-09 13:54:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-09 13:54:10 +0000 |
| commit | ffdd7ac071fa63b549c5de31c5049ea911e1feeb (patch) | |
| tree | 62944169228e7b0f33dc327358f7822d7c076813 /mk | |
| parent | ad92b319ff607facce16edc308ed3281b3bd9f39 (diff) | |
| download | pkgsrc-ffdd7ac071fa63b549c5de31c5049ea911e1feeb.tar.gz | |
Back out last change that moved the prepending of BUILDLINK_CPPFLAGS and
BUILDLINK_LDFLAGS to CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS from
bsd.buildlink.mk to bsd.pkg.mk. They're unnecessary after the recent
changes to bonobo/buildlink.mk and to libglade/buildlink.mk that removed
their settings of BUILDLINK_CPPFLAGS.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.buildlink.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index 6dc35893ca8..a6f02aef275 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.40 2001/10/05 21:32:59 tron Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.41 2001/10/09 13:54:10 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -122,6 +122,11 @@ BUILDLINK_DIR?= ${WRKDIR}/.buildlink BUILDLINK_CPPFLAGS= -I${BUILDLINK_DIR}/include BUILDLINK_LDFLAGS= -L${BUILDLINK_DIR}/lib +CFLAGS:= ${BUILDLINK_CPPFLAGS} ${CFLAGS} +CXXFLAGS:= ${BUILDLINK_CPPFLAGS} ${CXXFLAGS} +CPPFLAGS:= ${BUILDLINK_CPPFLAGS} ${CPPFLAGS} +LDFLAGS:= ${BUILDLINK_LDFLAGS} ${LDFLAGS} + CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" CONFIGURE_ENV+= BUILDLINK_CPPFLAGS="${BUILDLINK_CPPFLAGS}" CONFIGURE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}" diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ed4574123f3..11663f6788c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.823 2001/10/05 21:33:00 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.824 2001/10/09 13:54:10 jlam Exp $ # # This file is in the public domain. # @@ -319,16 +319,6 @@ DISTINFO_FILE?= ${.CURDIR}/distinfo M4?= /usr/bin/m4 .endif -.if defined(BUILDLINK_CPPFLAGS) -CFLAGS:= ${BUILDLINK_CPPFLAGS} ${CFLAGS} -CXXFLAGS:= ${BUILDLINK_CPPFLAGS} ${CXXFLAGS} -CPPFLAGS:= ${BUILDLINK_CPPFLAGS} ${CPPFLAGS} -.endif - -.if defined(BUILDLINK_LDFLAGS) -LDFLAGS:= ${BUILDLINK_LDFLAGS} ${LDFLAGS} -.endif - .if !defined(X11_BUILDLINK_MK) . if defined(USE_X11BASE) || defined(USE_X11) LDFLAGS+= -Wl,-R${X11BASE}/lib |