mergegcc9

6 files changed, 8 insertions, 23 deletions

diff --git a/usr/src/lib/libcontract/Makefile b/usr/src/lib/libcontract/Makefile
index 8d05db4980..1768051bb4 100644
--- a/usr/src/lib/libcontract/Makefile
+++ b/usr/src/lib/libcontract/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.lib
 
@@ -36,15 +34,14 @@ MSGFILES =	common/process_dump.c common/device_dump.c \
 		common/libcontract_priv.c
 POFILE =	libcontract.po
 
-all := 		TARGET = all
+all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install	:=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 $(POFILE):	$(MSGFILES)
 	$(BUILDPO.msgfiles)
diff --git a/usr/src/lib/libcontract/Makefile.com b/usr/src/lib/libcontract/Makefile.com
index 050d42944e..6ec88f473f 100644
--- a/usr/src/lib/libcontract/Makefile.com
+++ b/usr/src/lib/libcontract/Makefile.com
@@ -22,8 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY = libcontract.a
 VERS = .1
@@ -40,10 +38,9 @@ OBJECTS = \
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-LIBS =		$(DYNLIB) $(LINTLIB)
-SRCDIR = 	../common
+LIBS =		$(DYNLIB)
+SRCDIR =	../common
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/llib-lcontract
 LDLIBS +=	-lnvpair -lc
 
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
@@ -53,6 +50,5 @@ CFLAGS +=	$(CCVERBOSE)
 
 all: $(LIBS)
 
-lint: $(LINTLIB) lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/libcontract/amd64/Makefile b/usr/src/lib/libcontract/amd64/Makefile
index dd68231e26..2bbd813164 100644
--- a/usr/src/lib/libcontract/amd64/Makefile
+++ b/usr/src/lib/libcontract/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/libcontract/i386/Makefile b/usr/src/lib/libcontract/i386/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libcontract/i386/Makefile
+++ b/usr/src/lib/libcontract/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/libcontract/sparc/Makefile b/usr/src/lib/libcontract/sparc/Makefile
index af76f5ab90..59045395eb 100644
--- a/usr/src/lib/libcontract/sparc/Makefile
+++ b/usr/src/lib/libcontract/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/libcontract/sparcv9/Makefile b/usr/src/lib/libcontract/sparcv9/Makefile
index cb39a2beff..2bbd813164 100644
--- a/usr/src/lib/libcontract/sparcv9/Makefile
+++ b/usr/src/lib/libcontract/sparcv9/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)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)