mergegcc9

6 files changed, 9 insertions, 23 deletions

diff --git a/usr/src/lib/libsec/Makefile b/usr/src/lib/libsec/Makefile
index c83d290f9d..1807da7cec 100644
--- a/usr/src/lib/libsec/Makefile
+++ b/usr/src/lib/libsec/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
 
@@ -37,7 +35,6 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 
 MSGFILES=	common/acltext.c common/aclutils.c common/aclmode.c \
 		common/aclsort.c common/aclcheck.c common/acl_lex.l \
@@ -47,7 +44,7 @@ POFILE=		libsec.po
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS) 
+all clean clobber install: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com
index 47fcc11acb..f32d7f2b31 100644
--- a/usr/src/lib/libsec/Makefile.com
+++ b/usr/src/lib/libsec/Makefile.com
@@ -28,20 +28,19 @@ LIBRARY= libsec.a
 VERS= .1
 
 YFLAGS =	-d -v -b acl
-LFLAGS = 	-t
+LFLAGS =	-t
 OBJS_SHARED= acl_common.o
 GENERATED_SRCS = acl.tab.o acl_lex.o
 OBJS_COMMON= aclcheck.o aclmode.o aclsort.o acltext.o aclutils.o
 OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED) $(GENERATED_SRCS)
 CLEANFILES += acl_lex.c acl.tab.c acl.tab.h
-LINTSRCS = $(OBJS_COMMON)
 
 # include library definitions
 include ../../Makefile.lib
 
 SRCDIR=		../common
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -I. -I../../../common/acl
@@ -63,13 +62,11 @@ include ../../Makefile.rootfs
 SRCS=		$(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \
 		 $(OBJS_SHARED:%.o=$(SRC)/common/acl/%.c)
 
-$(LINTLIB):= SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
 
 pics/%.o: ../../../common/acl/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/lib/libsec/amd64/Makefile b/usr/src/lib/libsec/amd64/Makefile
index e24ef38245..fd6f777e6e 100644
--- a/usr/src/lib/libsec/amd64/Makefile
+++ b/usr/src/lib/libsec/amd64/Makefile
@@ -22,16 +22,14 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LIBS=	$(DYNLIB) $(LINTLIB)
+LIBS=	$(DYNLIB)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libsec/i386/Makefile b/usr/src/lib/libsec/i386/Makefile
index 2a944b0b43..8537c30eda 100644
--- a/usr/src/lib/libsec/i386/Makefile
+++ b/usr/src/lib/libsec/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) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libsec/sparc/Makefile b/usr/src/lib/libsec/sparc/Makefile
index 2a944b0b43..8537c30eda 100644
--- a/usr/src/lib/libsec/sparc/Makefile
+++ b/usr/src/lib/libsec/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) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libsec/sparcv9/Makefile b/usr/src/lib/libsec/sparcv9/Makefile
index e24ef38245..fd6f777e6e 100644
--- a/usr/src/lib/libsec/sparcv9/Makefile
+++ b/usr/src/lib/libsec/sparcv9/Makefile
@@ -22,16 +22,14 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LIBS=	$(DYNLIB) $(LINTLIB)
+LIBS=	$(DYNLIB)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)