From 01b416b8957e91c09a5635c805d763d5b74e4b31 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 11 Jun 2001 06:34:17 +0000
Subject: 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.

---
 wm/enlightenment/Makefile      | 3 +--
 wm/flwm/Makefile               | 4 ++--
 wm/icewm/Makefile.common       | 3 +--
 wm/wmakerconf/Makefile         | 3 +--
 wm/wmx-current/Makefile.common | 4 +---
 5 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'wm')

diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index b7aa480f7cd..2db45991081 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/19 03:56:40 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:53 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -20,7 +20,6 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-fsstd
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 MAKE_ENV+=		USER=${SHAREOWN}:${SHAREGRP}
 
 post-install:
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index fb28299f677..177eab49701 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
 #
 
 DISTNAME=	flwm-0.25
@@ -15,7 +15,7 @@ DEPENDS+=	fltk-*:../../x11/fltk
 USE_X11BASE=	# defined
 
 GNU_CONFIGURE=	# defined
-CONFIGURE_ENV+=	X_LIBS="-lGL" CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=	X_LIBS="-lGL"
 CPPFLAGS+=	-I${X11PREFIX}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a45c1907e2c..7fc8b6a76e5 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/03/03 22:01:11 tron Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/06/11 06:34:53 jlam Exp $
 #
 
 DISTNAME=	icewm-1.0.4
@@ -21,7 +21,6 @@ PATCHDIR=	${.CURDIR}/../../wm/icewm/patches
 .if ${OPSYS} == "NetBSD"
 .if exists(/usr/include/machine/apmvar.h)
 CPPFLAGS+=	-DCONFIG_APM
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 .endif
 
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 927437b29b9..83df28ffd76 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
 #
 
 DISTNAME=	wmakerconf-2.7
@@ -19,7 +19,6 @@ USE_PERL5=	yes
 USE_LIBINTL=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 # for libProplist
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/wm/wmx-current/Makefile.common b/wm/wmx-current/Makefile.common
index 3e3c25e25a3..f3e358bd10c 100644
--- a/wm/wmx-current/Makefile.common
+++ b/wm/wmx-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/04/19 15:32:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/06/11 06:34:53 jlam Exp $
 
 DISTNAME=	wmx-6pre6
 WMX_VERS=	5.0.6
@@ -15,8 +15,6 @@ USE_XPM=	# defined
 EVAL_PREFIX=	XPMDIR=xpm
 
 GNU_CONFIGURE=	# defined
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 CPPFLAGS+=	-I${XPMDIR}/include
 CXXFLAGS+=	-I${XPMDIR}/include
 
-- 
cgit v1.2.3