6 files changed, 19 insertions, 25 deletions
diff --git a/usr/src/lib/libmalloc/Makefile b/usr/src/lib/libmalloc/Makefile
index 6918eb42d4..ed60dde730 100644
--- a/usr/src/lib/libmalloc/Makefile
+++ b/usr/src/lib/libmalloc/Makefile
@@ -34,11 +34,10 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 delete :=       TARGET= delete
 install :=      TARGET= install
-lint :=         TARGET= lint
 _msg :=		TARGET= _msg
 package :=      TARGET= package
 
-LIBRARY= 	libmalloc.a
+LIBRARY=	libmalloc.a
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
@@ -49,7 +48,7 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean clobber delete install package: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		../common/mallint.h
diff --git a/usr/src/lib/libmalloc/Makefile.com b/usr/src/lib/libmalloc/Makefile.com
index a32dbd13e0..f7f9942f8d 100644
--- a/usr/src/lib/libmalloc/Makefile.com
+++ b/usr/src/lib/libmalloc/Makefile.com
@@ -22,33 +22,34 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libmalloc.a
 VERS=		.1
 
-OBJECTS= 	malloc.o
+OBJECTS=	malloc.o
 
 # include library definitions
 include ../../Makefile.lib
 
 SRCDIR =	../common
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
-LINTSRC=	$(LINTLIB:%.ln=%)
-LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
-LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I../../common/inc -D_REENTRANT
 DYNFLAGS +=	$(ZINTERPOSE)
 LDLIBS +=	-lc
 
+COMPATLINKS=	usr/ccs/lib/libmalloc.so
+COMPATLINKS64=	usr/ccs/lib/$(MACH64)/libmalloc.so
+
+$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1
+
 .KEEP_STATE:
 
-lint: lintcheck
 
 # include library targets
 include ../../Makefile.targ
@@ -56,7 +57,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/libmalloc/amd64/Makefile b/usr/src/lib/libmalloc/amd64/Makefile
index d50a21bdb0..01c18f35a7 100644
--- a/usr/src/lib/libmalloc/amd64/Makefile
+++ b/usr/src/lib/libmalloc/amd64/Makefile
@@ -22,7 +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
@@ -32,4 +32,4 @@ include ../../Makefile.lib.64
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libmalloc/i386/Makefile b/usr/src/lib/libmalloc/i386/Makefile
index 87b5005f59..3d6e266f97 100644
--- a/usr/src/lib/libmalloc/i386/Makefile
+++ b/usr/src/lib/libmalloc/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,5 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libmalloc/sparc/Makefile b/usr/src/lib/libmalloc/sparc/Makefile
index 87b5005f59..3d6e266f97 100644
--- a/usr/src/lib/libmalloc/sparc/Makefile
+++ b/usr/src/lib/libmalloc/sparc/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,5 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libmalloc/sparcv9/Makefile b/usr/src/lib/libmalloc/sparcv9/Makefile
index d50a21bdb0..01c18f35a7 100644
--- a/usr/src/lib/libmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libmalloc/sparcv9/Makefile
@@ -22,7 +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
@@ -32,4 +32,4 @@ include ../../Makefile.lib.64
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)