Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Nov 2014 14:01:28 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r275119 - projects/building-blocks/tools/build/mk
Message-ID:  <201411261401.sAQE1SGd069975@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Nov 26 14:01:27 2014
New Revision: 275119
URL: https://svnweb.freebsd.org/changeset/base/275119

Log:
  Fix use of OLD_FILES and OLD_LIBS for MK_BSNMP and MK_TESTS
  
  Convention in the file is that .a files be added to OLD_FILES and versioned .so's
  be added to OLD_LIBS

Modified:
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 13:56:54 2014	(r275118)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 14:01:27 2014	(r275119)
@@ -354,23 +354,23 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h
 OLD_FILES+=usr/include/bsnmp/snmpclient.h
 OLD_FILES+=usr/include/bsnmp/snmpmod.h
 OLD_FILES+=usr/lib/libbsnmp.a
-OLD_FILES+=usr/lib/libbsnmp.so.6
+OLD_LIBS+=usr/lib/libbsnmp.so.6
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbsnmptools.a
-OLD_FILES+=usr/lib/libbsnmptools.so.0
+OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools_p.a
-OLD_FILES+=usr/lib/snmp_atm.so.6
-OLD_FILES+=usr/lib/snmp_bridge.so.6
-OLD_FILES+=usr/lib/snmp_hast.so.6
-OLD_FILES+=usr/lib/snmp_hostres.so.6
-OLD_FILES+=usr/lib/snmp_lm75.so.6
-OLD_FILES+=usr/lib/snmp_mibII.so.6
-OLD_FILES+=usr/lib/snmp_netgraph.so.6
-OLD_FILES+=usr/lib/snmp_pf.so.6
-OLD_FILES+=usr/lib/snmp_target.so.6
-OLD_FILES+=usr/lib/snmp_usm.so.6
-OLD_FILES+=usr/lib/snmp_vacm.so.6
-OLD_FILES+=usr/lib/snmp_wlan.so.6
+OLD_LIBS+=usr/lib/snmp_atm.so.6
+OLD_LIBS+=usr/lib/snmp_bridge.so.6
+OLD_LIBS+=usr/lib/snmp_hast.so.6
+OLD_LIBS+=usr/lib/snmp_hostres.so.6
+OLD_LIBS+=usr/lib/snmp_lm75.so.6
+OLD_LIBS+=usr/lib/snmp_mibII.so.6
+OLD_LIBS+=usr/lib/snmp_netgraph.so.6
+OLD_LIBS+=usr/lib/snmp_pf.so.6
+OLD_LIBS+=usr/lib/snmp_target.so.6
+OLD_LIBS+=usr/lib/snmp_usm.so.6
+OLD_LIBS+=usr/lib/snmp_vacm.so.6
+OLD_LIBS+=usr/lib/snmp_wlan.so.6
 OLD_FILES+=usr/sbin/bsnmpd
 OLD_FILES+=usr/sbin/gensnmptree
 OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz
@@ -4390,15 +4390,15 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
-OLD_LIBS+=usr/lib/libatf-c++.a
+OLD_FILES+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
-OLD_LIBS+=usr/lib/libatf-c++_p.a
-OLD_LIBS+=usr/lib/libatf-c.a
+OLD_FILES+=usr/lib/libatf-c++_p.a
+OLD_FILES+=usr/lib/libatf-c.a
 OLD_LIBS+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
-OLD_LIBS+=usr/lib/libatf-c_p.a
+OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/private/libatf-c.so.0
 OLD_LIBS+=usr/lib/private/libatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
@@ -4878,11 +4878,11 @@ OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
-OLD_FILES+=usr/lib/libatf-c.so.1
+OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
-OLD_FILES+=usr/lib/libatf-c++.so.1
+OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411261401.sAQE1SGd069975>