6 files changed, 17 insertions, 34 deletions
diff --git a/usr/src/lib/libbsm/Makefile b/usr/src/lib/libbsm/Makefile
index 86c7bb9802..bdc233e81c 100644
--- a/usr/src/lib/libbsm/Makefile
+++ b/usr/src/lib/libbsm/Makefile
@@ -34,7 +34,6 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 package :=	TARGET= package
 
 .KEEP_STATE:
@@ -45,20 +44,20 @@ COMMONDIR = common
 # Macros for libbsm header files. These define user-level only interfaces.
 #
 GENHDRS = audit_uevents.h
-HDRS = libbsm.h devices.h devalloc.h adt.h adt_event.h audit_private.h 
+HDRS = libbsm.h devices.h devalloc.h adt.h adt_event.h audit_private.h
 GENSRCS =	$(COMMONDIR)/adt_xlate.c $(COMMONDIR)/adt_event.h
 COMMONHDRS =	$(HDRS:%=$(COMMONDIR)/%)
-ROOTHDRDIR = 	$(ROOT)/usr/include/bsm
-ROOTCHDRS = 	$(HDRS:%=$(ROOTHDRDIR)/%)
-ROOTHDRS = 	$(GENHDRS:%=$(ROOTHDRDIR)/%)
+ROOTHDRDIR =	$(ROOT)/usr/include/bsm
+ROOTCHDRS =	$(HDRS:%=$(ROOTHDRDIR)/%)
+ROOTHDRS =	$(GENHDRS:%=$(ROOTHDRDIR)/%)
 
 CHECKCHDRS =	$(COMMONHDRS:%.h=%.check)
 CHECKHDRS =	$(GENHDRS:%.h=%.check)
 
-$(ROOTHDRS) := 	FILEMODE = 0644
+$(ROOTHDRS) :=	FILEMODE = 0644
 $(ROOTCHDRS) :=	FILEMODE = 0644
 
-all install lint package: $(GENSRCS) $(SUBDIRS)
+all install package: $(GENSRCS) $(SUBDIRS)
 clean clobber delete: $(SUBDIRS)
 
 #
@@ -67,8 +66,8 @@ clean clobber delete: $(SUBDIRS)
 # from here.
 #
 
-ROOTETCSECURITY = 	$(ROOT)/etc/security
-$(ROOTETCSECURITY) := 	DIRMODE = 0755
+ROOTETCSECURITY =	$(ROOT)/etc/security
+$(ROOTETCSECURITY) :=	DIRMODE = 0755
 
 ESFILES =		audit_class audit_event
 ESSRC =			$(ESFILES:%=%.txt)
@@ -176,7 +175,7 @@ $(ROOTDTDDIR)/% $(ROOTXSLDIR)/%: %
 $(AUDITDIRS):
 	$(INS.dir)
 
-$(ARSYMLNK): 
+$(ARSYMLNK):
 	$(RM) $@
 	$(SYMLINK) ../../../../var/audit $@
 
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 86c8ebd0fb..d608a188a8 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -24,7 +24,7 @@
 # Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libbsm.a
-VERS = 		.1
+VERS =		.1
 OBJECTS=	adr.o \
 		adrf.o \
 		adrm.o \
@@ -74,14 +74,7 @@ include ../../Makefile.rootfs
 
 SRCDIR =	../common
 
-LIBS =	 	$(DYNLIB) $(LINTLIB)
-
-LINTSRC= $(LINTLIB:%.ln=%)
-$(LINTLIB) :=	SRCS = ../common/$(LINTSRC)
-ROOTLINTDIR=	$(ROOTLIBDIR)
-ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
-CLEANFILES +=	$(LINTOUT) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb -ltsol -linetutil -lscf
@@ -107,7 +100,6 @@ TEXT_DOMAIN= SUNW_OST_OSLIB
 
 all: $(LIBS)
 
-lint: lintcheck
 
 # Include library targets
 #
@@ -116,7 +108,3 @@ include ../../Makefile.targ
 pics/%.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
-
-# install rule for lint library target
-$(ROOTLINTDIR)/%: ../common/%
-	$(INS.file)
diff --git a/usr/src/lib/libbsm/amd64/Makefile b/usr/src/lib/libbsm/amd64/Makefile
index 2e8cdecf75..6782495649 100644
--- a/usr/src/lib/libbsm/amd64/Makefile
+++ b/usr/src/lib/libbsm/amd64/Makefile
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libbsm/i386/Makefile b/usr/src/lib/libbsm/i386/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libbsm/i386/Makefile
+++ b/usr/src/lib/libbsm/i386/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libbsm/sparc/Makefile b/usr/src/lib/libbsm/sparc/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libbsm/sparc/Makefile
+++ b/usr/src/lib/libbsm/sparc/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libbsm/sparcv9/Makefile b/usr/src/lib/libbsm/sparcv9/Makefile
index 2e8cdecf75..6782495649 100644
--- a/usr/src/lib/libbsm/sparcv9/Makefile
+++ b/usr/src/lib/libbsm/sparcv9/Makefile
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)