From owner-svn-src-projects@FreeBSD.ORG  Wed May 15 18:56:43 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B7D5F38F;
 Wed, 15 May 2013 18:56:43 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AAC63361;
 Wed, 15 May 2013 18:56:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FIuhVU056333;
 Wed, 15 May 2013 18:56:43 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FIuhFe056332;
 Wed, 15 May 2013 18:56:43 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305151856.r4FIuhFe056332@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 15 May 2013 18:56:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250669 - projects/flex-sf/usr.bin/lex
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 18:56:43 -0000

Author: jkim
Date: Wed May 15 18:56:43 2013
New Revision: 250669
URL: http://svnweb.freebsd.org/changeset/base/250669

Log:
  Improve bootstrapping flex.

Modified:
  projects/flex-sf/usr.bin/lex/Makefile

Modified: projects/flex-sf/usr.bin/lex/Makefile
==============================================================================
--- projects/flex-sf/usr.bin/lex/Makefile	Wed May 15 18:55:21 2013	(r250668)
+++ projects/flex-sf/usr.bin/lex/Makefile	Wed May 15 18:56:43 2013	(r250669)
@@ -33,6 +33,7 @@ MLINKS+=	lex.1 lex++.1
 WARNS?=		3
 
 CLEANFILES=	scan.c skel.c
+GENFILES=	parse.c parse.h scan.c skel.c
 
 SUBDIR=		lib
 
@@ -50,21 +51,19 @@ skel.c: mkskel.sh flex.skl
 	sed 's/m4postproc_/m4_/g' | \
 	sh ${FLEXDIR}/mkskel.sh > ${.TARGET}
 
-bootstrap: scan.c skel.c
-	cmp -s ${.CURDIR}/initscan.c scan.c || { \
-		rm -f scan.c ; \
-		cp -f ${.CURDIR}/initscan.c scan.c ; \
-	}
-	cmp -s ${.CURDIR}/initskel.c skel.c || { \
-		rm -f skel.c ; \
-		cp -f ${.CURDIR}/initskel.c skel.c ; \
+bootstrap: initparse.c initparse.h initscan.c initskel.c
+.for _f in ${GENFILES}
+	@diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' -q \
+	    ${.CURDIR}/init${_f} ${_f} 2> /dev/null || { \
+		echo "Bootstrapping ${_f}" ; \
+		cp -f ${.CURDIR}/init${_f} ${_f} ; \
 	}
+.endfor
 
 test: check
 check: ${PROG}
-	./${PROG} ${LFLAGS} -t ${COMPRESSION} ${FLEXDIR}/scan.l \
-	| sed 's,\"${FLEXDIR}/scan.l\",\"scan.l\",' \
-	| diff -I '\$$FreeBS[D]: .*\$$' ${.CURDIR}/initscan.c -
+	./${PROG} ${LFLAGS} -t ${COMPRESSION} ${FLEXDIR}/scan.l | \
+	diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' ${.CURDIR}/initscan.c -
 	@echo "Check successful"
 
 .include <bsd.prog.mk>