mergegcc9

6 files changed, 6 insertions, 15 deletions

diff --git a/usr/src/lib/scsi/libscsi/Makefile b/usr/src/lib/scsi/libscsi/Makefile
index c21f8e06fd..6bde94ef10 100644
--- a/usr/src/lib/scsi/libscsi/Makefile
+++ b/usr/src/lib/scsi/libscsi/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 include	../../Makefile.lib
 include	../Makefile.defs
@@ -41,12 +40,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 install_h:=	TARGET = install_h
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
diff --git a/usr/src/lib/scsi/libscsi/Makefile.com b/usr/src/lib/scsi/libscsi/Makefile.com
index d8e18b1fb3..470da55161 100644
--- a/usr/src/lib/scsi/libscsi/Makefile.com
+++ b/usr/src/lib/scsi/libscsi/Makefile.com
@@ -47,21 +47,18 @@ CERRWARN += -_gcc=-Wno-type-limits
 LDLIBS += \
 	-lumem \
 	-lc
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 ROOTLIBDIR =	$(ROOTSCSILIBDIR)
 ROOTLIBDIR64 =	$(ROOTSCSILIBDIR)/$(MACH64)
 
 CLEANFILES += \
 	../common/scsi_errno.c
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
 all : $(LIBS)
 
-lint : lintcheck
-
 ../common/scsi_errno.c: ../common/mkerrno.sh ../common/libscsi.h
 	sh ../common/mkerrno.sh < ../common/libscsi.h > $@
 
diff --git a/usr/src/lib/scsi/libscsi/amd64/Makefile b/usr/src/lib/scsi/libscsi/amd64/Makefile
index e3fab7e838..75b07600ad 100644
--- a/usr/src/lib/scsi/libscsi/amd64/Makefile
+++ b/usr/src/lib/scsi/libscsi/amd64/Makefile
@@ -23,9 +23,8 @@
 # Copyright 2008 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)
diff --git a/usr/src/lib/scsi/libscsi/i386/Makefile b/usr/src/lib/scsi/libscsi/i386/Makefile
index b68583c86f..6c35d1fc88 100644
--- a/usr/src/lib/scsi/libscsi/i386/Makefile
+++ b/usr/src/lib/scsi/libscsi/i386/Makefile
@@ -23,8 +23,7 @@
 # Copyright 2008 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)
diff --git a/usr/src/lib/scsi/libscsi/sparc/Makefile b/usr/src/lib/scsi/libscsi/sparc/Makefile
index b68583c86f..6c35d1fc88 100644
--- a/usr/src/lib/scsi/libscsi/sparc/Makefile
+++ b/usr/src/lib/scsi/libscsi/sparc/Makefile
@@ -23,8 +23,7 @@
 # Copyright 2008 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)
diff --git a/usr/src/lib/scsi/libscsi/sparcv9/Makefile b/usr/src/lib/scsi/libscsi/sparcv9/Makefile
index e3fab7e838..75b07600ad 100644
--- a/usr/src/lib/scsi/libscsi/sparcv9/Makefile
+++ b/usr/src/lib/scsi/libscsi/sparcv9/Makefile
@@ -23,9 +23,8 @@
 # Copyright 2008 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)