From owner-svn-src-all@FreeBSD.ORG  Thu Mar 28 04:13:53 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])
 by hub.freebsd.org (Postfix) with ESMTP id 3D5A8577;
 Thu, 28 Mar 2013 04:13:53 +0000 (UTC)
 (envelope-from markj@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 3005470C;
 Thu, 28 Mar 2013 04:13:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S4DrIu086590;
 Thu, 28 Mar 2013 04:13:53 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S4DrqH086589;
 Thu, 28 Mar 2013 04:13:53 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201303280413.r2S4DrqH086589@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 28 Mar 2013 04:13:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248806 - 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.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: Thu, 28 Mar 2013 04:13:53 -0000

Author: markj
Date: Thu Mar 28 04:13:52 2013
New Revision: 248806
URL: http://svnweb.freebsd.org/changeset/base/248806

Log:
  Make sure that ${SHLIB_NAME}.debug and ${SHLIB_NAME}.symbols are always
  deleted by a "make clean" when DEBUG_FLAGS is set.
  
  Reported by:	gleb
  Approved by:	emaste (co-mentor)

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

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Thu Mar 28 02:44:15 2013	(r248805)
+++ head/share/mk/bsd.lib.mk	Thu Mar 28 04:13:52 2013	(r248806)
@@ -202,6 +202,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
 .endif
 
 .if defined(DEBUG_FLAGS)
+CLEANFILES+=	${SHLIB_NAME_FULL} ${SHLIB_NAME}.symbols
 ${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.symbols
 	${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.symbols \
 	    ${SHLIB_NAME_FULL} ${.TARGET}
@@ -209,7 +210,7 @@ ${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLI
 ${SHLIB_NAME}.symbols: ${SHLIB_NAME_FULL}
 	${OBJCOPY} --only-keep-debug ${SHLIB_NAME_FULL} ${.TARGET}
 .endif
-.endif
+.endif #defined(SHLIB_NAME)
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
 _LIBS+=		lib${LIB}_pic.a
@@ -398,10 +399,7 @@ clean:
 .endif
 	rm -f ${SHLIB_LINK}
 .endif
-.if defined(LIB) && !empty(LIB)
-	rm -f lib${LIB}.so.* lib${LIB}.so
-.endif
-.endif
+.endif # defined(SHLIB_NAME)
 .if defined(WANT_LINT) && defined(LIB) && !empty(LIB)
 	rm -f ${LINTOBJS}
 .endif