8 files changed, 14 insertions, 68 deletions
diff --git a/usr/src/lib/libsmedia/Makefile b/usr/src/lib/libsmedia/Makefile
index ebf5d73f37..a5509a3f9c 100644
--- a/usr/src/lib/libsmedia/Makefile
+++ b/usr/src/lib/libsmedia/Makefile
@@ -22,11 +22,6 @@
 # Copyright (c) 1991-1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libsmedia/Makefile
-#
-
 
 SUBDIRS = plugins library
 def             :=      TARGET= def
@@ -34,12 +29,9 @@ all             :=      TARGET= all
 install         :=      TARGET= install
 clean           :=      TARGET= clean
 clobber         :=      TARGET= clobber
-lint            :=      TARGET= lint
-modlintlib      :=      TARGET= modlintlib
-clean.lint      :=      TARGET= clean.lint
-_msg      	:=      TARGET= catalog
+_msg		:=	TARGET= catalog
 
-all install clean clobber lint _msg : $(SUBDIRS)
+all install clean clobber _msg: $(SUBDIRS)
 
 $(SUBDIRS) : FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
@@ -47,5 +39,5 @@ $(SUBDIRS) : FRC
 install_h check :
 	@cd library; pwd; $(MAKE) $@
 
-FRC : 
+FRC :
 
diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile
index cf1194b02e..7bb74c58a8 100644
--- a/usr/src/lib/libsmedia/library/Makefile
+++ b/usr/src/lib/libsmedia/library/Makefile
@@ -34,10 +34,9 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 delete :=	TARGET= delete
 install :=	TARGET= install
-lint :=		TARGET= lint
 package :=	TARGET= package
 
-LIBRARY= 	libsmedia.a
+LIBRARY=	libsmedia.a
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
@@ -48,7 +47,7 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean delete install lint package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
 
 clobber : $(SUBDIRS)
 	$(RM) $(CLOBBERFILES)
diff --git a/usr/src/lib/libsmedia/library/Makefile.com b/usr/src/lib/libsmedia/library/Makefile.com
index 4807392165..cdaf3d7624 100644
--- a/usr/src/lib/libsmedia/library/Makefile.com
+++ b/usr/src/lib/libsmedia/library/Makefile.com
@@ -37,21 +37,12 @@ include ../../../Makefile.lib
 
 SRCDIR =	../common
 
-# We can't lint the rpcgen-generated files.
-# (Well, we could, but we couldn't fix them.)
-lintcheck := SRCS = ../common/l_generic.c ../common/l_misc.c
-
-LIBS = $(DYNLIB) $(LINTLIB)
-
-# definitions for lint
-
-LINTSRC=        $(LINTLIB:%.ln=%)
-$(LINTLIB):= SRCS = ../common/$(LINTSRC)
+LIBS = $(DYNLIB)
 
 CLEANFILES +=	$(DERIVED_FILES:%=../common/%)
 
 CPPFLAGS += -D_REENTRANT -I$(SRC)/cmd/smserverd/
-CFLAGS +=	$(CCVERBOSE) 
+CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
@@ -62,7 +53,6 @@ LDLIBS +=	-lnsl -lc
 
 all: $(LIBS)
 
-lint:	lintcheck
 
 # include library targets
 include ../../../Makefile.targ
@@ -71,14 +61,6 @@ objs/%.o pics/%.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-# install rule for lint library target
-
-$(ROOTLINTDIR64)/%: ../common/%
-	$(INS.file)
-
-$(ROOTLINTDIR)/%: ../common/%
-	$(INS.file)
-
 #
 # Derived files
 #
diff --git a/usr/src/lib/libsmedia/library/i386/Makefile b/usr/src/lib/libsmedia/library/i386/Makefile
index 50cbcb01b9..fdba8b0416 100644
--- a/usr/src/lib/libsmedia/library/i386/Makefile
+++ b/usr/src/lib/libsmedia/library/i386/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
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libsmedia/library/sparc/Makefile b/usr/src/lib/libsmedia/library/sparc/Makefile
index 6cfe59363b..fc9f3314e3 100644
--- a/usr/src/lib/libsmedia/library/sparc/Makefile
+++ b/usr/src/lib/libsmedia/library/sparc/Makefile
@@ -22,12 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS)  $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS)  $(ROOTLINKS)
 
diff --git a/usr/src/lib/libsmedia/plugins/Makefile b/usr/src/lib/libsmedia/plugins/Makefile
index d4e3468005..c9db1892bf 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile
+++ b/usr/src/lib/libsmedia/plugins/Makefile
@@ -22,8 +22,6 @@
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2013 Garrett D'Amore <garrett@damore.org>
 #
-# lib/libsmedia/plugins/Makefile
-
 
 SUBDIRS = \
 	blkdev \
@@ -35,17 +33,13 @@ all             :=      TARGET= all
 install         :=      TARGET= install
 clean           :=      TARGET= clean
 clobber         :=      TARGET= clobber
-lint            :=      TARGET= lint
-modlintlib      :=      TARGET= modlintlib
-clean.lint      :=      TARGET= clean.lint
 check           :=      TARGET= check
 install_h       :=      TARGET= install_h
-catalog       	:=      TARGET= catalog
+catalog		:=	TARGET= catalog
 
-all install install_h clean clobber lint catalog : $(SUBDIRS)
+all install install_h clean clobber catalog: $(SUBDIRS)
 
 $(SUBDIRS) : FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-FRC : 
-
+FRC :
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com
index 5c239ce171..3d9bfb9bf6 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.com
+++ b/usr/src/lib/libsmedia/plugins/Makefile.com
@@ -29,7 +29,6 @@ LIBS =		$(DYNLIB)
 CPPFLAGS +=	-I../inc -I$(SRC)/cmd/smserverd/
 LDLIBS +=	-lc $(PLUGIN_SPECIFIC_LIB)
 
-LINTPLUGIN  = llib-$(LIBNAME).ln
 PLUGINDIR = $(ROOTLIBDIR)/smedia
 PLUGINDIR64 = $(ROOTLIBDIR)/smedia/$(MACH64)
 FILEMODE = 555
@@ -38,26 +37,13 @@ SOFILES	= $(LIBRARY:%.a=%.so)
 PLUGINS  = $(LIBS:%=$(PLUGINDIR)/%)
 PLUGINS64  = $(LIBS:%=$(PLUGINDIR64)/%)
 
-CLEANFILES=	$(LINTOUT) $(LINTPLUGIN)
-
 SRCDIR =	../common
 
 # not linted
 SMATCH=off
 
-LINTFLAGS += -xu
-LINTFLAGS64 += -xu
-$(LINTPLUGIN) :=	SRCS=$(OBJECTS:%.o=../common/%.c)
-$(LINTPLUGIN) :=	LINTFLAGS=-nvx
-$(LINTPLUGIN) :=	TARGET_ARCH=
-
-LINTSRC=	$(LINTPLUGIN:%.ln=%)
-ROOTLINTDIR=	$(ROOTLIBDIR)
-ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
 .KEEP_STATE:
 
-lint:	lintcheck
 
 objs/%.o pics/%.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin
index 0dd6e561b6..331d8bfc9e 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.plugin
+++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBS =		$(DYNLIB)
 
@@ -41,9 +39,8 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 
-all install clean lint: $(SUBDIRS)
+all install clean: $(SUBDIRS)
 
 clobber : $(SUBDIRS)
 	$(RM) -f $(POFILE)
@@ -64,4 +61,4 @@ $(POFILE) : $(POFILE_SRCS)
 	$(COMPILE.cpp) $(POFILE_SRCS) | $(XGETTEXT) $(XGETFLAGS) -
 	$(SED) -e '/^domain/d' messages.po > $@
 	$(RM) messages.po
- 
+