From owner-svn-src-all@freebsd.org  Wed Nov 25 22:32:17 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76320A37FD2;
 Wed, 25 Nov 2015 22:32:17 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4032E1E7B;
 Wed, 25 Nov 2015 22:32:17 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAPMWGPk054436;
 Wed, 25 Nov 2015 22:32:16 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAPMWGKs054435;
 Wed, 25 Nov 2015 22:32:16 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511252232.tAPMWGKs054435@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 22:32:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291338 - head/share/mk
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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2015 22:32:17 -0000

Author: bdrewery
Date: Wed Nov 25 22:32:16 2015
New Revision: 291338
URL: https://svnweb.freebsd.org/changeset/base/291338

Log:
  Fix the "common object" handling to not depend on ".o" if SRCS only contains
  headers.
  
  This resulted in 'don't know how to make .o.' errors after the changes in
  r289286.
  
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.progs.mk

Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk	Wed Nov 25 22:07:18 2015	(r291337)
+++ head/share/mk/bsd.progs.mk	Wed Nov 25 22:32:16 2015	(r291338)
@@ -102,7 +102,10 @@ _PROGS_ALL_SRCS+=	${s}
 .endfor
 .endfor
 .if !empty(_PROGS_COMMON_SRCS)
-_PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:N*.h:R:S/$/.o/g}
+_PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:M*.h}
+.if !empty(_PROGS_COMMON_SRCS:N*.h)
+_PROGS_COMMON_OBJS+=	${_PROGS_COMMON_SRCS:N*.h:R:S/$/.o/g}
+.endif
 ${PROGS}: ${_PROGS_COMMON_OBJS}
 .endif