mergegcc9

6 files changed, 6 insertions, 19 deletions

diff --git a/usr/src/lib/libslp/Makefile b/usr/src/lib/libslp/Makefile
index 77b05be5b8..2d7e391c32 100644
--- a/usr/src/lib/libslp/Makefile
+++ b/usr/src/lib/libslp/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 $(SRC)/Makefile.master
 
@@ -54,12 +52,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .PARALLEL: $(SUBDIRS)
 
-all lint install: install_h .WAIT $(SUBDIRS)
+all install: install_h .WAIT $(SUBDIRS)
 
 clean clobber: $(SUBDIRS)
 
diff --git a/usr/src/lib/libslp/Makefile.com b/usr/src/lib/libslp/Makefile.com
index 23e7d1f0c5..2a5a867eff 100644
--- a/usr/src/lib/libslp/Makefile.com
+++ b/usr/src/lib/libslp/Makefile.com
@@ -36,9 +36,8 @@ OBJECTS =	SLPFindAttrs.o SLPFindSrvTypes.o SLPFindSrvs.o SLPOpen.o \
 
 include ../../Makefile.lib
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lnsl -lsocket
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../clib
 
@@ -56,6 +55,5 @@ SMATCH=off
 
 all:
 
-lint: lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/libslp/etc/Makefile b/usr/src/lib/libslp/etc/Makefile
index 491c079d70..ef37a5c093 100644
--- a/usr/src/lib/libslp/etc/Makefile
+++ b/usr/src/lib/libslp/etc/Makefile
@@ -40,7 +40,7 @@ CLOBBERFILES = $(ROOTETCINETCONF)
 
 .KEEP_STATE:
 
-all lint clean _msg:
+all clean _msg:
 
 install:	$(DIRS) $(ROOTETCINETCONF)
 
diff --git a/usr/src/lib/libslp/i386/Makefile b/usr/src/lib/libslp/i386/Makefile
index 2a944b0b43..d6eed917a9 100644
--- a/usr/src/lib/libslp/i386/Makefile
+++ b/usr/src/lib/libslp/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)
diff --git a/usr/src/lib/libslp/javalib/Makefile b/usr/src/lib/libslp/javalib/Makefile
index 58ff8b437d..7e553b122e 100644
--- a/usr/src/lib/libslp/javalib/Makefile
+++ b/usr/src/lib/libslp/javalib/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -92,11 +90,9 @@ manifests:
 install:	all message_files manifests $(JARDESTDIR) $(INSJARS)
 
 # empty targets for top-level building compatability
-
-install_h lint:
+install_h:
 
 # jstyle check -- more for developer's convenience since the checks are
 # not automated in the build.
-
 check:
 	$(JSTYLE) -p $(PKGPATH)/*.java
diff --git a/usr/src/lib/libslp/sparc/Makefile b/usr/src/lib/libslp/sparc/Makefile
index 2a944b0b43..d6eed917a9 100644
--- a/usr/src/lib/libslp/sparc/Makefile
+++ b/usr/src/lib/libslp/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,4 @@ include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)