From owner-svn-src-projects@FreeBSD.ORG  Wed May 15 21:08:52 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 0818EDCA;
 Wed, 15 May 2013 21:08:52 +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 EEE29B2A;
 Wed, 15 May 2013 21:08:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FL8pAo004670;
 Wed, 15 May 2013 21:08:51 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FL8p6B004668;
 Wed, 15 May 2013 21:08:51 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305152108.r4FL8p6B004668@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 15 May 2013 21:08:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250680 - 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 21:08:52 -0000

Author: jkim
Date: Wed May 15 21:08:51 2013
New Revision: 250680
URL: http://svnweb.freebsd.org/changeset/base/250680

Log:
  Build version numbers from config.h.

Added:
  projects/flex-sf/usr.bin/lex/version.awk   (contents, props changed)
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 21:05:25 2013	(r250679)
+++ projects/flex-sf/usr.bin/lex/Makefile	Wed May 15 21:08:51 2013	(r250680)
@@ -37,17 +37,12 @@ GENFILES=	parse.c parse.h scan.c skel.c
 
 SUBDIR=		lib
 
-MAJOR_VERSION=		2
-MINOR_VERSION=		5
-SUBMINOR_VERSION=	37
+FLEX_VERSION=	`awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h`
 
-skel.c: mkskel.sh flex.skl
+skel.c: config.h mkskel.sh flex.skl version.awk
 	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' \
 	    ${FLEXDIR}/flex.skl | \
-	m4 -I${FLEXDIR} -P \
-	    -DFLEX_MAJOR_VERSION=${MAJOR_VERSION} \
-	    -DFLEX_MINOR_VERSION=${MINOR_VERSION} \
-	    -DFLEX_SUBMINOR_VERSION=${SUBMINOR_VERSION} | \
+	m4 -I${FLEXDIR} -P ${FLEX_VERSION} | \
 	sed 's/m4postproc_/m4_/g' | \
 	sh ${FLEXDIR}/mkskel.sh > ${.TARGET}
 

Added: projects/flex-sf/usr.bin/lex/version.awk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/flex-sf/usr.bin/lex/version.awk	Wed May 15 21:08:51 2013	(r250680)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+BEGIN {
+	FS = "[ \t\.\"]+"
+}
+
+{
+	if ($1 ~ /^#define$/ && $2 ~ /^VERSION$/) {
+		printf("-DFLEX_MAJOR_VERSION=%s\n", $3);
+		printf("-DFLEX_MINOR_VERSION=%s\n", $4);
+		printf("-DFLEX_SUBMINOR_VERSION=%s\n", $5);
+	}
+}