From owner-svn-src-all@freebsd.org  Tue Dec  1 22:39:20 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 497E9A3E009;
 Tue,  1 Dec 2015 22:39:20 +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 17E8C1BCA;
 Tue,  1 Dec 2015 22:39:20 +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 tB1MdJaT018859;
 Tue, 1 Dec 2015 22:39:19 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB1MdJiU018858;
 Tue, 1 Dec 2015 22:39:19 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512012239.tB1MdJiU018858@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: Tue, 1 Dec 2015 22:39:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291621 - head/sbin/ipf
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: Tue, 01 Dec 2015 22:39:20 -0000

Author: bdrewery
Date: Tue Dec  1 22:39:19 2015
New Revision: 291621
URL: https://svnweb.freebsd.org/changeset/base/291621

Log:
  Don't add LIBADD=ipf to libipf itself.
  
  This had no real impact since libipf is a static INTERNALLIB.  It does conflict
  with an assertion I am adding for LIBADD though.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sbin/ipf/Makefile.inc

Modified: head/sbin/ipf/Makefile.inc
==============================================================================
--- head/sbin/ipf/Makefile.inc	Tue Dec  1 22:20:04 2015	(r291620)
+++ head/sbin/ipf/Makefile.inc	Tue Dec  1 22:39:19 2015	(r291621)
@@ -18,7 +18,9 @@ CFLAGS+=	-DUSE_INET6
 CFLAGS+=	-DNOINET6
 .endif
 
+.if ${.CURDIR:M*/libipf} == ""
 LIBADD+=	ipf
+.endif
 
 CLEANFILES+=	y.tab.c y.tab.h