diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-11 06:34:17 +0000 |
| commit | c4e71c5e7a56600bcceba68cbed656ef7246e444 (patch) | |
| tree | 6b373d2a314b8d27a2d1f47c4cb173dc5c0d7a48 /cad | |
| parent | a057ade2a392070aecc8ee511ae1cab01869b513 (diff) | |
| download | pkgsrc-c4e71c5e7a56600bcceba68cbed656ef7246e444.tar.gz | |
CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so
adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/gwave/Makefile | 3 | ||||
| -rw-r--r-- | cad/ng-spice/Makefile | 3 | ||||
| -rw-r--r-- | cad/verilog-current/Makefile | 3 | ||||
| -rw-r--r-- | cad/verilog/Makefile | 3 | ||||
| -rw-r--r-- | cad/vipec/Makefile | 5 |
5 files changed, 6 insertions, 11 deletions
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile index 10ec17519d7..9597833cacd 100644 --- a/cad/gwave/Makefile +++ b/cad/gwave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 13:46:23 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:19 jlam Exp $ # DISTNAME= gwave-20001123 @@ -16,7 +16,6 @@ GNU_CONFIGURE= YES # LDFLAGS to get -lreadline # CPPFLAGS to get -I${LOCALBASE}/include for readline/readline.h CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS+="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" post-extract: ${CP} ${FILESDIR}/sp2sp.1 ${WRKSRC}/doc/sp2sp.1 diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 1c881122101..072e327cbb4 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 13:46:26 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:20 jlam Exp $ # DISTNAME= ng-spice-rework-13 @@ -23,7 +23,6 @@ REPLACE_NCURSES= configure configure.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-debug LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -CONFIGURE_ENV+= LDFLAGS+="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CONFLICTS+= spice-* diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile index feb8ece752e..c362ca41675 100644 --- a/cad/verilog-current/Makefile +++ b/cad/verilog-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/05/21 22:25:19 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:20 jlam Exp $ # DISTNAME= verilog-20010520 @@ -19,6 +19,5 @@ CONFLICTS+= verilog-[0-9]* GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS+="${LDFLAGS}" .include "../../mk/bsd.pkg.mk" diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 4d47dc334c9..095e0804b47 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/04/11 13:36:19 wennmach Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:20 jlam Exp $ # DISTNAME= verilog-0.4 @@ -19,6 +19,5 @@ GNU_CONFIGURE= yes USE_GMAKE= yes # to find ipal.h: CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS+="${LDFLAGS}" .include "../../mk/bsd.pkg.mk" diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index ac97f42a921..29d5a9c8c75 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/02/16 13:46:30 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:20 jlam Exp $ # DISTNAME= vipec-2.0.4 @@ -20,8 +20,7 @@ EVAL_PREFIX+= QT2DIR=qt2-libs # make sure configure finds png CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt2" \ - USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" \ - CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" + USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt2" post-patch: |