mergegcc9

47 files changed, 56 insertions, 194 deletions

diff --git a/usr/src/lib/pam_modules/Makefile b/usr/src/lib/pam_modules/Makefile
index 4df91511af..babbcc4de3 100644
--- a/usr/src/lib/pam_modules/Makefile
+++ b/usr/src/lib/pam_modules/Makefile
@@ -59,12 +59,11 @@ catalog :=	TARGET= _msg
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all clean clobber install lint _msg: $(SUBDIRS)
+all clean clobber install _msg: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pam_modules/allow/Makefile b/usr/src/lib/pam_modules/allow/Makefile
index 99f0e3a31c..838b7380ef 100644
--- a/usr/src/lib/pam_modules/allow/Makefile
+++ b/usr/src/lib/pam_modules/allow/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
 
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/allow/Makefile.com b/usr/src/lib/pam_modules/allow/Makefile.com
index 50c8f669a1..2d9ae89bb8 100644
--- a/usr/src/lib/pam_modules/allow/Makefile.com
+++ b/usr/src/lib/pam_modules/allow/Makefile.com
@@ -23,11 +23,10 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_allow.a
 VERS=		.1
-OBJECTS= 	allow.o
+OBJECTS=	allow.o
 
 include		../../Makefile.pam_modules
 
@@ -35,6 +34,5 @@ LDLIBS +=	-lpam -lc
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile b/usr/src/lib/pam_modules/authtok_check/Makefile
index 61bc9201a9..b7d6f72b56 100644
--- a/usr/src/lib/pam_modules/authtok_check/Makefile
+++ b/usr/src/lib/pam_modules/authtok_check/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		authtok_check.po
@@ -38,11 +36,10 @@ 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)
 
 _msg: $(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile.com b/usr/src/lib/pam_modules/authtok_check/Makefile.com
index ffdafad371..95c326b6d6 100644
--- a/usr/src/lib/pam_modules/authtok_check/Makefile.com
+++ b/usr/src/lib/pam_modules/authtok_check/Makefile.com
@@ -41,6 +41,5 @@ SMATCH=off
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_get/Makefile b/usr/src/lib/pam_modules/authtok_get/Makefile
index a7ef66e32d..c37923062d 100644
--- a/usr/src/lib/pam_modules/authtok_get/Makefile
+++ b/usr/src/lib/pam_modules/authtok_get/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		authtok_get.po
@@ -38,11 +36,10 @@ 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)
 
 _msg: $(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/authtok_get/Makefile.com b/usr/src/lib/pam_modules/authtok_get/Makefile.com
index f39d523e07..d5f50ed8f8 100644
--- a/usr/src/lib/pam_modules/authtok_get/Makefile.com
+++ b/usr/src/lib/pam_modules/authtok_get/Makefile.com
@@ -23,9 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/authtok_get/Makefile.com
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_authtok_get.a
 VERS=		.1
@@ -37,6 +34,5 @@ LDLIBS		+= -lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include		../../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_store/Makefile b/usr/src/lib/pam_modules/authtok_store/Makefile
index 2237eccf27..f05be52fe3 100644
--- a/usr/src/lib/pam_modules/authtok_store/Makefile
+++ b/usr/src/lib/pam_modules/authtok_store/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		authtok_store.po
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/authtok_store/Makefile.com b/usr/src/lib/pam_modules/authtok_store/Makefile.com
index 6346195a73..28efe7c649 100644
--- a/usr/src/lib/pam_modules/authtok_store/Makefile.com
+++ b/usr/src/lib/pam_modules/authtok_store/Makefile.com
@@ -23,10 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/pam_modules/authtok_store/Makefile.com
-#
 
 LIBRARY=	pam_authtok_store.a
 VERS=		.1
@@ -38,6 +34,5 @@ LDLIBS		+= -lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/deny/Makefile b/usr/src/lib/pam_modules/deny/Makefile
index bb8685eb35..4395d45c4f 100644
--- a/usr/src/lib/pam_modules/deny/Makefile
+++ b/usr/src/lib/pam_modules/deny/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
 
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/deny/Makefile.com b/usr/src/lib/pam_modules/deny/Makefile.com
index 24c98eab47..4709a9fd58 100644
--- a/usr/src/lib/pam_modules/deny/Makefile.com
+++ b/usr/src/lib/pam_modules/deny/Makefile.com
@@ -23,13 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/deny/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_deny.a
 VERS=		.1
-OBJECTS= 	deny.o
+OBJECTS=	deny.o
 
 include		../../Makefile.pam_modules
 
@@ -37,6 +34,5 @@ LDLIBS +=	-lpam -lc
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/dhkeys/Makefile b/usr/src/lib/pam_modules/dhkeys/Makefile
index 619aaeb110..c337d12bf5 100644
--- a/usr/src/lib/pam_modules/dhkeys/Makefile
+++ b/usr/src/lib/pam_modules/dhkeys/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
 
@@ -42,11 +40,10 @@ 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)
 
 _msg: $(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/dhkeys/Makefile.com b/usr/src/lib/pam_modules/dhkeys/Makefile.com
index c5a0391025..8ec736a113 100644
--- a/usr/src/lib/pam_modules/dhkeys/Makefile.com
+++ b/usr/src/lib/pam_modules/dhkeys/Makefile.com
@@ -39,6 +39,5 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include		../../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/dial_auth/Makefile b/usr/src/lib/pam_modules/dial_auth/Makefile
index bdccadb1e5..28453b52ac 100644
--- a/usr/src/lib/pam_modules/dial_auth/Makefile
+++ b/usr/src/lib/pam_modules/dial_auth/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
 
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/dial_auth/Makefile.com b/usr/src/lib/pam_modules/dial_auth/Makefile.com
index 116c37763f..d3a6d760d6 100644
--- a/usr/src/lib/pam_modules/dial_auth/Makefile.com
+++ b/usr/src/lib/pam_modules/dial_auth/Makefile.com
@@ -23,13 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/dial_auth/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_dial_auth.a
 VERS=		.1
-OBJECTS= 	dial_auth.o
+OBJECTS=	dial_auth.o
 
 include		../../Makefile.pam_modules
 
@@ -37,6 +34,5 @@ LDLIBS +=	-lpam -lc
 
 all:		$(LIBS)
 
-lint:		lintcheck
 
 include		$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/krb5/Makefile b/usr/src/lib/pam_modules/krb5/Makefile
index 27c168cd9e..8cb7fc57e4 100644
--- a/usr/src/lib/pam_modules/krb5/Makefile
+++ b/usr/src/lib/pam_modules/krb5/Makefile
@@ -37,11 +37,10 @@ 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/pam_modules/krb5/Makefile.com b/usr/src/lib/pam_modules/krb5/Makefile.com
index 44e00890ad..b00a756a9e 100644
--- a/usr/src/lib/pam_modules/krb5/Makefile.com
+++ b/usr/src/lib/pam_modules/krb5/Makefile.com
@@ -37,7 +37,7 @@ PRIV_OBJ=	krb5_authenticate.o \
 
 OBJECTS=	$(PRIV_OBJ)
 
-include 	../../Makefile.pam_modules
+include		../../Makefile.pam_modules
 include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
 
 CPPFLAGS +=	-I../../../gss_mechs/mech_krb5/include \
@@ -57,15 +57,9 @@ SMATCH=off
 # called after dlclose()
 DYNFLAGS +=	$(ZNODELETE)
 
-CLOBBERFILES += $(LINTLIB) $(LINTOUT) $(POFILE)
-
-#
-# Don't lint derived files
-#
-lint    :=      SRCS= $(PRIV_OBJ:%.o=$(SRCDIR)/%.c)
+CLOBBERFILES += $(POFILE)
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/krb5_migrate/Makefile b/usr/src/lib/pam_modules/krb5_migrate/Makefile
index 190282d0bb..3beb200414 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		pam_krb5_migrate.po
@@ -38,11 +36,10 @@ 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/pam_modules/krb5_migrate/Makefile.com b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com
index 498b00f83b..71a3e4f9fb 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/Makefile.com
+++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com
@@ -45,6 +45,5 @@ LDLIBS +=	-lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include		../../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/ldap/Makefile b/usr/src/lib/pam_modules/ldap/Makefile
index 4a5995bb82..a09f4f6534 100644
--- a/usr/src/lib/pam_modules/ldap/Makefile
+++ b/usr/src/lib/pam_modules/ldap/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
 
@@ -39,11 +37,10 @@ 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/pam_modules/ldap/Makefile.com b/usr/src/lib/pam_modules/ldap/Makefile.com
index 8166a466b1..be6c625cae 100644
--- a/usr/src/lib/pam_modules/ldap/Makefile.com
+++ b/usr/src/lib/pam_modules/ldap/Makefile.com
@@ -28,7 +28,7 @@
 LIBRARY=	pam_ldap.a
 VERS=		 .1
 
-OBJECTS= 	ldap_authenticate.o \
+OBJECTS=	ldap_authenticate.o \
 		ldap_setcred.o \
 		ldap_acct_mgmt.o \
 		ldap_close_session.o \
@@ -44,6 +44,5 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/list/Makefile b/usr/src/lib/pam_modules/list/Makefile
index 21e8a6a469..528739d716 100644
--- a/usr/src/lib/pam_modules/list/Makefile
+++ b/usr/src/lib/pam_modules/list/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
 
@@ -37,11 +35,10 @@ 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)
 
 _msg:	$(MSGDOMAINPOFILE)
 
@@ -50,5 +47,5 @@ $(SUBDIRS):	FRC
 
 FRC:
 
-include 	$(SRC)/Makefile.msg.targ
+include		$(SRC)/Makefile.msg.targ
 include		../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/list/Makefile.com b/usr/src/lib/pam_modules/list/Makefile.com
index 0099d415ea..ff0e799f45 100644
--- a/usr/src/lib/pam_modules/list/Makefile.com
+++ b/usr/src/lib/pam_modules/list/Makefile.com
@@ -22,12 +22,10 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	pam_list.a
 VERS=		.1
-OBJECTS= 	list.o
+OBJECTS=	list.o
 
 include		../../Makefile.pam_modules
 
@@ -35,6 +33,5 @@ LDLIBS +=	-lpam -lc
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/passwd_auth/Makefile b/usr/src/lib/pam_modules/passwd_auth/Makefile
index b93feb4aa8..8b8463f9ff 100644
--- a/usr/src/lib/pam_modules/passwd_auth/Makefile
+++ b/usr/src/lib/pam_modules/passwd_auth/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		passwd_auth.po
@@ -38,11 +36,10 @@ 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)
 
 _msg: $(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/passwd_auth/Makefile.com b/usr/src/lib/pam_modules/passwd_auth/Makefile.com
index 18cc740cd5..b1b2d51533 100644
--- a/usr/src/lib/pam_modules/passwd_auth/Makefile.com
+++ b/usr/src/lib/pam_modules/passwd_auth/Makefile.com
@@ -25,7 +25,6 @@
 #
 # usr/src/lib/pam_modules/passwd_auth/Makefile.com
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_passwd_auth.a
 VERS=		.1
@@ -37,6 +36,5 @@ LDLIBS		+= -lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include		../../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/rhosts_auth/Makefile b/usr/src/lib/pam_modules/rhosts_auth/Makefile
index f37449cda6..71e2072cef 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/Makefile
+++ b/usr/src/lib/pam_modules/rhosts_auth/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
 
@@ -38,11 +36,10 @@ 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)
 
 _msg:	$(MSGDOMAINPOFILE)
 
@@ -51,5 +48,5 @@ $(SUBDIRS): FRC
 
 FRC:
 
-include 	$(SRC)/Makefile.msg.targ
-include 	../../Makefile.targ
+include		$(SRC)/Makefile.msg.targ
+include		../../Makefile.targ
diff --git a/usr/src/lib/pam_modules/rhosts_auth/Makefile.com b/usr/src/lib/pam_modules/rhosts_auth/Makefile.com
index 60cff0ce18..4989fe20e5 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/Makefile.com
+++ b/usr/src/lib/pam_modules/rhosts_auth/Makefile.com
@@ -23,10 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/rhosts_auth/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	pam_rhosts_auth.a
 VERS=		.1
@@ -38,6 +34,5 @@ LDLIBS +=	-lpam -lsocket -lc
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/roles/Makefile b/usr/src/lib/pam_modules/roles/Makefile
index 1851f68225..e7679c787e 100644
--- a/usr/src/lib/pam_modules/roles/Makefile
+++ b/usr/src/lib/pam_modules/roles/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
 
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/roles/Makefile.com b/usr/src/lib/pam_modules/roles/Makefile.com
index 74da5a5c2f..a44a455b00 100644
--- a/usr/src/lib/pam_modules/roles/Makefile.com
+++ b/usr/src/lib/pam_modules/roles/Makefile.com
@@ -23,13 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/roles/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_roles.a
 VERS=		.1
-OBJECTS= 	roles.o
+OBJECTS=	roles.o
 
 include		../../Makefile.pam_modules
 
@@ -37,6 +34,5 @@ LDLIBS +=	-lpam -lsecdb -lc
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/sample/Makefile b/usr/src/lib/pam_modules/sample/Makefile
index c9a7427362..b720c07ec0 100644
--- a/usr/src/lib/pam_modules/sample/Makefile
+++ b/usr/src/lib/pam_modules/sample/Makefile
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		sample_authenticate.po
@@ -38,11 +36,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/sample/Makefile.com b/usr/src/lib/pam_modules/sample/Makefile.com
index a38f09734a..9a34fbc897 100644
--- a/usr/src/lib/pam_modules/sample/Makefile.com
+++ b/usr/src/lib/pam_modules/sample/Makefile.com
@@ -24,13 +24,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/sample/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	pam_sample.a
 VERS=		.1
-OBJECTS= 	sample_authenticate.o \
+OBJECTS=	sample_authenticate.o \
 		sample_setcred.o \
 		sample_acct_mgmt.o \
 		sample_close_session.o \
@@ -44,6 +41,5 @@ LDLIBS +=	-lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/smb/Makefile b/usr/src/lib/pam_modules/smb/Makefile
index ea50c3ae1f..b3e928ecf1 100644
--- a/usr/src/lib/pam_modules/smb/Makefile
+++ b/usr/src/lib/pam_modules/smb/Makefile
@@ -23,10 +23,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		smb_passwd.po
@@ -39,11 +37,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/smb/Makefile.com b/usr/src/lib/pam_modules/smb/Makefile.com
index 2a461d53bc..4e851da8ab 100644
--- a/usr/src/lib/pam_modules/smb/Makefile.com
+++ b/usr/src/lib/pam_modules/smb/Makefile.com
@@ -40,6 +40,5 @@ LDLIBS		+= -lsmb -lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/smbfs/Makefile b/usr/src/lib/pam_modules/smbfs/Makefile
index b621fb5528..4e0563df4d 100644
--- a/usr/src/lib/pam_modules/smbfs/Makefile
+++ b/usr/src/lib/pam_modules/smbfs/Makefile
@@ -23,10 +23,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		smbfs_login.po
@@ -43,11 +41,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/smbfs/Makefile.com b/usr/src/lib/pam_modules/smbfs/Makefile.com
index 5b8d9dcb3f..a7e8873cea 100644
--- a/usr/src/lib/pam_modules/smbfs/Makefile.com
+++ b/usr/src/lib/pam_modules/smbfs/Makefile.com
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	pam_smbfs_login.a
 VERS=		.1
@@ -35,11 +33,8 @@ include		../../Makefile.pam_modules
 LDLIBS		+= -lpam -lc -lsmbfs
 CFLAGS		+= -I../../../libsmbfs
 CFLAGS64	+= -I../../../libsmbfs
-LINTFLAGS	+= -I$(SRC)/lib/libsmbfs
-LINTFLAGS64	+= -I$(SRC)/lib/libsmbfs
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/timestamp/Makefile b/usr/src/lib/pam_modules/timestamp/Makefile
index 81f04b8670..360745de29 100644
--- a/usr/src/lib/pam_modules/timestamp/Makefile
+++ b/usr/src/lib/pam_modules/timestamp/Makefile
@@ -11,7 +11,7 @@
 # Copyright 2014 Nexenta Systems, Inc.
 #
 
-include 	../../Makefile.lib
+include		../../Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		pam_timestamp.po
@@ -24,11 +24,10 @@ 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/timestamp/Makefile.com b/usr/src/lib/pam_modules/timestamp/Makefile.com
index 596dbb5228..b32f9487a0 100644
--- a/usr/src/lib/pam_modules/timestamp/Makefile.com
+++ b/usr/src/lib/pam_modules/timestamp/Makefile.com
@@ -17,7 +17,7 @@
 
 LIBRARY=	pam_timestamp.a
 VERS=		.1
-OBJECTS= 	pam_timestamp.o
+OBJECTS=	pam_timestamp.o
 
 include		../../Makefile.pam_modules
 
@@ -25,6 +25,5 @@ LDLIBS +=	-lpam -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/tsol_acct/Makefile b/usr/src/lib/pam_modules/tsol_acct/Makefile
index 7f7344b7b7..cc8ffaf569 100644
--- a/usr/src/lib/pam_modules/tsol_acct/Makefile
+++ b/usr/src/lib/pam_modules/tsol_acct/Makefile
@@ -22,23 +22,20 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../../Makefile.lib
 
-SUBDIRS= 	$(MACH)
-$(BUILD64)SUBDIRS += 	$(MACH64)
+SUBDIRS=	$(MACH)
+$(BUILD64)SUBDIRS +=	$(MACH64)
 
 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)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pam_modules/tsol_acct/Makefile.com b/usr/src/lib/pam_modules/tsol_acct/Makefile.com
index fb0e0d9568..86c503560f 100644
--- a/usr/src/lib/pam_modules/tsol_acct/Makefile.com
+++ b/usr/src/lib/pam_modules/tsol_acct/Makefile.com
@@ -22,11 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/tsol/Makefile.com
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
 
 LIBRARY=	pam_tsol_account.a
 VERS=		.1
@@ -38,6 +33,5 @@ LDLIBS +=       -lc -lpam -ltsol -ltsnet
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_account/Makefile b/usr/src/lib/pam_modules/unix_account/Makefile
index 7870eaa9b2..1d76458e78 100644
--- a/usr/src/lib/pam_modules/unix_account/Makefile
+++ b/usr/src/lib/pam_modules/unix_account/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
 
@@ -31,18 +29,17 @@ TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		unix_account.po
 MSGFILES=	unix_acct.c
 
-SUBDIRS= 	$(MACH)
-$(BUILD64)SUBDIRS += 	$(MACH64)
+SUBDIRS=	$(MACH)
+$(BUILD64)SUBDIRS +=	$(MACH64)
 
 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)
 
 # need rule here
 $(POFILE): $(MSGFILES)
diff --git a/usr/src/lib/pam_modules/unix_account/Makefile.com b/usr/src/lib/pam_modules/unix_account/Makefile.com
index 9971e8b296..b3d0f20ad0 100644
--- a/usr/src/lib/pam_modules/unix_account/Makefile.com
+++ b/usr/src/lib/pam_modules/unix_account/Makefile.com
@@ -36,6 +36,5 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_auth/Makefile b/usr/src/lib/pam_modules/unix_auth/Makefile
index 7379dc399b..49c71f90ff 100644
--- a/usr/src/lib/pam_modules/unix_auth/Makefile
+++ b/usr/src/lib/pam_modules/unix_auth/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
 
@@ -31,18 +29,17 @@ TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		unix_auth.po
 MSGFILES=	unix_auth.c
 
-SUBDIRS= 	$(MACH)
-$(BUILD64)SUBDIRS += 	$(MACH64)
+SUBDIRS=	$(MACH)
+$(BUILD64)SUBDIRS +=	$(MACH64)
 
 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)
 
 _msg: $(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/unix_auth/Makefile.com b/usr/src/lib/pam_modules/unix_auth/Makefile.com
index d3fb47fdaa..682c774848 100644
--- a/usr/src/lib/pam_modules/unix_auth/Makefile.com
+++ b/usr/src/lib/pam_modules/unix_auth/Makefile.com
@@ -22,10 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/pam_modules/unix_auth/Makefile.com
-#
 
 LIBRARY=	pam_unix_auth.a
 VERS=		.1
@@ -37,6 +33,5 @@ LDLIBS		+= -lpam -lsecdb -lc
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile b/usr/src/lib/pam_modules/unix_cred/Makefile
index 3c3962f06a..68a82db3d2 100644
--- a/usr/src/lib/pam_modules/unix_cred/Makefile
+++ b/usr/src/lib/pam_modules/unix_cred/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
 
@@ -31,18 +29,17 @@ TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		unix_cred.po
 MSGFILES=	unix_cred.c
 
-SUBDIRS= 	$(MACH)
-$(BUILD64)SUBDIRS += 	$(MACH64)
+SUBDIRS=	$(MACH)
+$(BUILD64)SUBDIRS +=	$(MACH64)
 
 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)
 
 _msg:		$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile.com b/usr/src/lib/pam_modules/unix_cred/Makefile.com
index 80e273840f..84b0e97f0e 100644
--- a/usr/src/lib/pam_modules/unix_cred/Makefile.com
+++ b/usr/src/lib/pam_modules/unix_cred/Makefile.com
@@ -35,6 +35,5 @@ CERRWARN	+= $(CNOWARN_UNINIT)
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_session/Makefile b/usr/src/lib/pam_modules/unix_session/Makefile
index 8cd0cb4374..170fb4b11f 100644
--- a/usr/src/lib/pam_modules/unix_session/Makefile
+++ b/usr/src/lib/pam_modules/unix_session/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
 
@@ -31,18 +29,17 @@ TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
 POFILE=		unix_session.po
 MSGFILES=	unix_session.c
 
-SUBDIRS= 	$(MACH)
-$(BUILD64)SUBDIRS += 	$(MACH64)
+SUBDIRS=	$(MACH)
+$(BUILD64)SUBDIRS +=	$(MACH64)
 
 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)
 
 _msg:	$(MSGDOMAINPOFILE)
 
diff --git a/usr/src/lib/pam_modules/unix_session/Makefile.com b/usr/src/lib/pam_modules/unix_session/Makefile.com
index 26216e2961..cad6f42a56 100644
--- a/usr/src/lib/pam_modules/unix_session/Makefile.com
+++ b/usr/src/lib/pam_modules/unix_session/Makefile.com
@@ -23,10 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/pam_modules/unix_session/Makefile.com
-#
 
 LIBRARY=	pam_unix_session.a
 VERS=		.1
@@ -40,6 +36,5 @@ CPPFLAGS	+= -D_FILE_OFFSET_BITS=64
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 include	$(SRC)/lib/Makefile.targ