mergegcc9

6 files changed, 6 insertions, 19 deletions

diff --git a/usr/src/lib/libtsnet/Makefile b/usr/src/lib/libtsnet/Makefile
index e02f847ac2..fe28b5a74a 100644
--- a/usr/src/lib/libtsnet/Makefile
+++ b/usr/src/lib/libtsnet/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
 
@@ -36,14 +34,13 @@ all	:= TARGET= all
 clean	:= TARGET= clean
 clobber	:= TARGET= clobber
 install	:= TARGET= install
-lint	:= TARGET= lint
 
 POFILE =	libtsnet.po
 MSGFILES =	common/misc.i
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
diff --git a/usr/src/lib/libtsnet/Makefile.com b/usr/src/lib/libtsnet/Makefile.com
index a929254ab1..3b3a3a334c 100644
--- a/usr/src/lib/libtsnet/Makefile.com
+++ b/usr/src/lib/libtsnet/Makefile.com
@@ -37,10 +37,9 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 SRCDIR =	../common
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LDLIBS +=	-lsocket -lnsl -lc -lsecdb -ltsol
 
@@ -53,6 +52,5 @@ CERRWARN +=	$(CNOWARN_UNINIT)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/libtsnet/amd64/Makefile b/usr/src/lib/libtsnet/amd64/Makefile
index 69cf39010b..a48c536235 100644
--- a/usr/src/lib/libtsnet/amd64/Makefile
+++ b/usr/src/lib/libtsnet/amd64/Makefile
@@ -23,9 +23,7 @@
 # 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/libtsnet/i386/Makefile b/usr/src/lib/libtsnet/i386/Makefile
index 2a944b0b43..8537c30eda 100644
--- a/usr/src/lib/libtsnet/i386/Makefile
+++ b/usr/src/lib/libtsnet/i386/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.com
 
@@ -31,4 +29,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libtsnet/sparc/Makefile b/usr/src/lib/libtsnet/sparc/Makefile
index 73ba2bbce8..1551cf2cb2 100644
--- a/usr/src/lib/libtsnet/sparc/Makefile
+++ b/usr/src/lib/libtsnet/sparc/Makefile
@@ -22,11 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libtsnet/sparcv9/Makefile b/usr/src/lib/libtsnet/sparcv9/Makefile
index 69cf39010b..a48c536235 100644
--- a/usr/src/lib/libtsnet/sparcv9/Makefile
+++ b/usr/src/lib/libtsnet/sparcv9/Makefile
@@ -23,9 +23,7 @@
 # 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)