From owner-svn-src-all@FreeBSD.ORG  Fri Sep  6 10:40:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6B909A5F;
 Fri,  6 Sep 2013 10:40:39 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5901F20B7;
 Fri,  6 Sep 2013 10:40:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r86AedhI097234;
 Fri, 6 Sep 2013 10:40:39 GMT (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r86Aedol097232;
 Fri, 6 Sep 2013 10:40:39 GMT (envelope-from theraven@svn.freebsd.org)
Message-Id: <201309061040.r86Aedol097232@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Fri, 6 Sep 2013 10:40:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255298 - head/lib/libiconv_modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Sep 2013 10:40:39 -0000

Author: theraven
Date: Fri Sep  6 10:40:38 2013
New Revision: 255298
URL: http://svnweb.freebsd.org/changeset/base/255298

Log:
  Use Makefile.inc instead of .export.

Modified:
  head/lib/libiconv_modules/Makefile
  head/lib/libiconv_modules/Makefile.inc

Modified: head/lib/libiconv_modules/Makefile
==============================================================================
--- head/lib/libiconv_modules/Makefile	Fri Sep  6 09:46:44 2013	(r255297)
+++ head/lib/libiconv_modules/Makefile	Fri Sep  6 10:40:38 2013	(r255298)
@@ -2,9 +2,6 @@
 
 .include <bsd.own.mk>
 
-CFLAGS+=	-Dbool=_Bool
-.export CFLAGS
-
 SUBDIR=	BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \
 	UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \
 	mapper_parallel mapper_serial mapper_std mapper_zone

Modified: head/lib/libiconv_modules/Makefile.inc
==============================================================================
--- head/lib/libiconv_modules/Makefile.inc	Fri Sep  6 09:46:44 2013	(r255297)
+++ head/lib/libiconv_modules/Makefile.inc	Fri Sep  6 10:40:38 2013	(r255298)
@@ -5,6 +5,9 @@
 SHLIB_MAJOR= 4
 WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../../libc/iconv
+
+CFLAGS+=	-Dbool=_Bool
+
 .if !defined(COMPAT_32BIT)
 SHLIBDIR= /usr/lib/i18n
 .else