The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d56ce5915c41517ccc7de2510daec200e100ef68
commit d56ce5915c41517ccc7de2510daec200e100ef68 Author: Mark Johnston <[email protected]> AuthorDate: 2024-01-24 19:47:56 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2024-01-24 22:10:24 +0000 mpsutil: Clean up libutil deps mpsutil doesn't use libutil, so doesn't need to include libutil.h. See commit 76103694a051335bec1da318f9c6e3a676dc0145. No functional change intended. MFC after: 1 week --- usr.sbin/mpsutil/Makefile | 4 ---- usr.sbin/mpsutil/mps_debug.c | 1 - usr.sbin/mpsutil/mps_set.c | 1 - usr.sbin/mpsutil/mps_show.c | 1 - 4 files changed, 7 deletions(-) diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile index a19c2f310167..aa59d8cddf76 100644 --- a/usr.sbin/mpsutil/Makefile +++ b/usr.sbin/mpsutil/Makefile @@ -1,17 +1,13 @@ - PROG= mpsutil SRCS= mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c MAN= mpsutil.8 WARNS?= 3 -#LIBADD= cam util LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil MLINKS= mpsutil.8 mprutil.8 CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS -# Avoid dirdep dependency on libutil -CFLAGS+= -I${SRCTOP}/lib/libutil # Here be dragons .ifdef DEBUG diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index c1eb57f7150d..68394de50143 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -32,7 +32,6 @@ #include <sys/types.h> #include <sys/sysctl.h> #include <err.h> -#include <libutil.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index 603c529b8696..a1b61356e4ec 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/errno.h> #include <err.h> -#include <libutil.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index bbb2b22c8c73..378d5380aa76 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -35,7 +35,6 @@ #include <sys/errno.h> #include <sys/endian.h> #include <err.h> -#include <libutil.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
