6 files changed, 8 insertions, 19 deletions
diff --git a/usr/src/lib/libdevid/Makefile b/usr/src/lib/libdevid/Makefile
index 86addda787..0596f63e85 100644
--- a/usr/src/lib/libdevid/Makefile
+++ b/usr/src/lib/libdevid/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include	../Makefile.lib
 
@@ -31,11 +29,10 @@ SUBDIRS =	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
-all :=      	TARGET= all
+all :=		TARGET= all
 install :=      TARGET= install
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
-lint :=         TARGET= lint
 test :=         TARGET= test
 
 # definitions for install_h target
@@ -46,7 +43,7 @@ CHECKHDRS=      $(HDRS:%.h=%.check)
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 $(ROOTHDRDIR)/%: %
 	$(INS.file)
diff --git a/usr/src/lib/libdevid/Makefile.com b/usr/src/lib/libdevid/Makefile.com
index cfef8fb21f..7b69bdf822 100644
--- a/usr/src/lib/libdevid/Makefile.com
+++ b/usr/src/lib/libdevid/Makefile.com
@@ -34,8 +34,7 @@ include ../../Makefile.rootfs
 SRCS =		../deviceid.c $(SRC)/common/devid/devid.c \
 		$(SRC)/common/devid/devid_scsi.c \
 		$(SRC)/common/devid/devid_smp.c
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 #
 # Libraries added to the next line must be present in miniroot
 #
@@ -47,7 +46,6 @@ CFLAGS +=	$(CCVERBOSE)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libdevid/amd64/Makefile b/usr/src/lib/libdevid/amd64/Makefile
index dd68231e26..2bbd813164 100644
--- a/usr/src/lib/libdevid/amd64/Makefile
+++ b/usr/src/lib/libdevid/amd64/Makefile
@@ -23,10 +23,8 @@
 # Copyright 2004 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) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libdevid/i386/Makefile b/usr/src/lib/libdevid/i386/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libdevid/i386/Makefile
+++ b/usr/src/lib/libdevid/i386/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2004 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/libdevid/sparc/Makefile b/usr/src/lib/libdevid/sparc/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libdevid/sparc/Makefile
+++ b/usr/src/lib/libdevid/sparc/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2004 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/libdevid/sparcv9/Makefile b/usr/src/lib/libdevid/sparcv9/Makefile
index cb39a2beff..ab72b4df45 100644
--- a/usr/src/lib/libdevid/sparcv9/Makefile
+++ b/usr/src/lib/libdevid/sparcv9/Makefile
@@ -23,10 +23,10 @@
 # Copyright 2004 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)