[patch] hwpmc [10/13]

[Aggelos Economopoulos <aoiko@xxxxxxxxxxxxxx>]

Comment out _FBSDID(). Build libpmc.

diff -upr lib/libpmc.freebsd/libpmc.c lib/libpmc/libpmc.c
--- lib/libpmc.freebsd/libpmc.c
+++ lib/libpmc/libpmc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.11 2007-04-11 04:52:09 jkoshy Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.11 2007-04-11 04:52:09 jkoshy Exp $");*/
 
 #include <sys/types.h>
 #include <sys/module.h>
diff -upr lib/libpmc.freebsd/pmclog.c lib/libpmc/pmclog.c
--- lib/libpmc.freebsd/pmclog.c
+++ lib/libpmc/pmclog.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.4 2006-03-26 12:20:53 jkoshy Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.4 2006-03-26 12:20:53 jkoshy Exp $");*/
 
 #include <sys/param.h>
 #include <sys/pmc.h>
Index: lib/Makefile
===================================================================
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- lib/Makefile
+++ lib/Makefile
@@ -25,9 +25,9 @@ SUBDIR=	libarchive libcom_err libcrypt l
 	libcalendar libcam libcompat libdevstat libedit libfetch \
 	libftpio libipsec libipx libisc libkcore libkinfo libkvm libmagic \
 	${_libmilter} ${_libncp} libnetgraph libopie libpam \
-	libpcap libposix1e libpthread librpcsvc ${_libsm} ${_libsmb} \
-	${_libsmdb} ${_libsmutil} libstand libtelnet libthread_xu libusbhid \
-	${_libvgl} libwrap libxpg4 liby libz i18n_module pam_module \
+	libpcap ${_libpmc} libposix1e libpthread librpcsvc ${_libsm} \
+	${_libsmb} ${_libsmdb} ${_libsmutil} libstand libtelnet libthread_xu \
+	libusbhid ${_libvgl} libwrap libxpg4 liby libz i18n_module pam_module \
 	libc_rtld libsctp
 
 .if exists(${.CURDIR}/compat/${MACHINE_ARCH}/Makefile)
@@ -52,6 +52,7 @@ _libsmutil=	libsmutil
 
 .if ${MACHINE_ARCH} == "i386"
 _libncp=	libncp
+_libpmc=	libpmc
 _libsmb=	libsmb
 _libvgl=	libvgl
 .endif
Index: include/Makefile
===================================================================
RCS file: /home/aggelos/imports/vcs/dcvs/src/include/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- include/Makefile	27 Jul 2007 13:57:18 -0000	1.36
+++ include/Makefile	24 Nov 2007 20:05:24 -0000
@@ -65,7 +65,7 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	netproto/atm/uni netproto/802_11
 
 LSUBDIRS3= vfs/isofs/cd9660 net/i4b/include \
-	dev/misc/lpt dev/netif/wi dev/video/bktr dev/video/meteor
+	dev/misc/lpt dev/misc/hwpmc dev/netif/wi dev/video/bktr dev/video/meteor
 
 # For SHARED=symlinks, bus/cam and netproto/atm are symlinks, so cam/scsi
 # and netproto/atm/* are taken care of