mergegcc9

9 files changed, 13 insertions, 31 deletions

diff --git a/usr/src/lib/libsecdb/Makefile b/usr/src/lib/libsecdb/Makefile
index 4d492d42ae..9885f6f950 100644
--- a/usr/src/lib/libsecdb/Makefile
+++ b/usr/src/lib/libsecdb/Makefile
@@ -33,12 +33,11 @@ all:=		TARGET= all
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
 install:=	TARGET= install
-lint:=		TARGET= lint
 _msg:=		TARGET= _msg
 
 .KEEP_STATE:
 
-ROOTETC = 		$(ROOT)/etc
+ROOTETC =		$(ROOT)/etc
 ROOTETCSECURITY =	$(ROOTETC)/security
 
 EFILES =	user_attr
@@ -72,7 +71,7 @@ CLASS_SCR_DIR =		$(INSTALL_DIR)/scripts
 CLASS_SCR_FILES =	$(SCRIPTS:%=$(CLASS_SCR_DIR)/%)
 $(CLASS_SCR_FILES) :=	FILEMODE = 0555
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean clobber delete install package: $(SUBDIRS)
 _msg: $(MSGSUBDIRS)
 
 install:	install_data
diff --git a/usr/src/lib/libsecdb/Makefile.com b/usr/src/lib/libsecdb/Makefile.com
index aa027f0efa..ae24955c20 100644
--- a/usr/src/lib/libsecdb/Makefile.com
+++ b/usr/src/lib/libsecdb/Makefile.com
@@ -26,23 +26,20 @@
 LIBRARY =	libsecdb.a
 VERS =		.1
 OBJECTS =	secdb.o getauthattr.o getexecattr.o getprofattr.o \
-	 	getuserattr.o chkauthattr.o
+		getuserattr.o chkauthattr.o
 
 include ../../Makefile.lib
 
 # Install this library in the root filesystem
 include ../../Makefile.rootfs
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 LDLIBS +=	-lnsl -lc
 
 SRCDIR =	../common
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
-LINTFLAGS +=	-DPIC
-LINTFLAGS64 +=	-DPIC
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	$(CNOWARN_UNINIT)
@@ -51,6 +48,5 @@ CERRWARN +=	$(CNOWARN_UNINIT)
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/libsecdb/amd64/Makefile b/usr/src/lib/libsecdb/amd64/Makefile
index 67538ac8f1..297028a599 100644
--- a/usr/src/lib/libsecdb/amd64/Makefile
+++ b/usr/src/lib/libsecdb/amd64/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 
@@ -32,4 +32,4 @@ include ../../Makefile.lib.64
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libsecdb/help/Makefile b/usr/src/lib/libsecdb/help/Makefile
index 17638f06f7..d907f83098 100644
--- a/usr/src/lib/libsecdb/help/Makefile
+++ b/usr/src/lib/libsecdb/help/Makefile
@@ -23,10 +23,6 @@
 # Copyright (c) 1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libsecdb/help/Makefile
-#
 
 SUBDIRS = auths profiles
 
@@ -34,12 +30,11 @@ all:=		TARGET= all
 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/libsecdb/help/auths/Makefile b/usr/src/lib/libsecdb/help/auths/Makefile
index 803c1870ce..300160c935 100644
--- a/usr/src/lib/libsecdb/help/auths/Makefile
+++ b/usr/src/lib/libsecdb/help/auths/Makefile
@@ -204,4 +204,4 @@ $(DIRS):
 $(MSGDIR)/%: %
 	$(INS.file)
 
-clean clobber lint:
+clean clobber:
diff --git a/usr/src/lib/libsecdb/help/profiles/Makefile b/usr/src/lib/libsecdb/help/profiles/Makefile
index a8701922f2..c83fb267f9 100644
--- a/usr/src/lib/libsecdb/help/profiles/Makefile
+++ b/usr/src/lib/libsecdb/help/profiles/Makefile
@@ -134,4 +134,4 @@ $(DIRS):
 $(MSGDIR)/%: %
 	$(INS.file)
 
-clean clobber lint:
+clean clobber:
diff --git a/usr/src/lib/libsecdb/i386/Makefile b/usr/src/lib/libsecdb/i386/Makefile
index 1e59e5b6e6..c8c3c5083d 100644
--- a/usr/src/lib/libsecdb/i386/Makefile
+++ b/usr/src/lib/libsecdb/i386/Makefile
@@ -23,14 +23,10 @@
 # Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# libsecdb/i386/Makefile
-
 
 include	../Makefile.com
 
 .KEEP_STATE:
 
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libsecdb/sparc/Makefile b/usr/src/lib/libsecdb/sparc/Makefile
index f24eef589c..5ab240f17d 100644
--- a/usr/src/lib/libsecdb/sparc/Makefile
+++ b/usr/src/lib/libsecdb/sparc/Makefile
@@ -23,13 +23,9 @@
 # Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# lib/libsecdb/sparc/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libsecdb/sparcv9/Makefile b/usr/src/lib/libsecdb/sparcv9/Makefile
index 7821a207c0..b8482c4e10 100644
--- a/usr/src/lib/libsecdb/sparcv9/Makefile
+++ b/usr/src/lib/libsecdb/sparcv9/Makefile
@@ -25,7 +25,7 @@
 #
 # lib/libsecdb/sparcv9/Makefile
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 
@@ -34,4 +34,4 @@ include ../../Makefile.lib.64
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)