mergegcc9

6 files changed, 3 insertions, 44 deletions

diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile
index a2b3c705ad..b0a8e11fae 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/conf/Makefile
@@ -20,13 +20,9 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1999-2000 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/picl/plugins/sun4u/littleneck/conf/Makefile
-#
 
 OBJECTS=
 
@@ -44,16 +40,12 @@ install	:= FILEMODE = 0444
 CONF=		platsvcd.conf psvcobj.conf
 ROOTCONF=	$(CONF:%=$(USR_PSM_LIB_DIR)/%)
 
-SRCS=		
+SRCS=
 
 LIBS =		$(DYNLIB)
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 ZDEFS	=
 
-LINTFLAGS +=
-
 .KEEP_STATE:
 
 SUBDIRS=
@@ -62,7 +54,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 
 all:
 
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
index 730e4518f3..dc83c086e4 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
@@ -39,8 +39,6 @@ install		:= FILEMODE = 0444
 CONF=           picldevtree.conf
 ROOTCONF=       $(CONF:%=$(ROOTLIBDIR)/%)
 
-ROOTLINTDIR =   $(ROOTLIBDIR)
-
 .KEEP_STATE:
 
 SUBDIRS=
@@ -49,9 +47,8 @@ all	:=	TARGET= all
 install :=	TARGET= install
 clean	:=	TARGET= clean
 clobber	:=	TARGET= clobber
-lint	:=	TARGET= lint
 
-all: 
+all:
 
 install:	$(ROOTLIBDIR) $(ROOTCONF)
 
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
index b740b5f92f..8e63545e8e 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
@@ -38,9 +38,6 @@ CONF=           libpiclfrudata.conf
 ROOTCONF=       $(CONF:%=$(ROOTLIBDIR)/%)
 $(ROOTCONF)	:= FILEMODE = 0644
 
-
-ROOTLINTDIR =   $(ROOTLIBDIR)
-
 .KEEP_STATE:
 
 SUBDIRS=
@@ -49,7 +46,6 @@ all	:=	TARGET= all
 install :=	TARGET= install
 clean	:=	TARGET= clean
 clobber	:=	TARGET= clobber
-lint	:=	TARGET= lint
 
 all: $(CONF)
 
@@ -59,9 +55,6 @@ install:	$(ROOTLIBDIR) $(ROOTCONF)
 include $(SRC)/lib/Makefile.targ
 include	$(SRC)/cmd/picl/plugins/Makefile.targ
 
-$(ROOTLINTDIR)/%: ../%
-	$(INS.file)
-
 lint:
 
 $(SUBDIRS): FRC
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile
index 5d672d87f4..5826a15c23 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/frutree/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libpiclfrutree.a
 VERS=		.1
@@ -51,7 +49,6 @@ ROOTCONF=	$(CONF:%=$(ROOTLIBDIR)/%)
 $(ROOTCONF)	:= FILEMODE = 0644
 INFOS=		$(CONF:%.conf=%.info)
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
 CLOBBERFILES += $(LIBLINKS)
 
 CPPFLAGS +=	-I$(SRC)/lib/libdevfsevent -I$(SRC)/uts/common
@@ -64,7 +61,6 @@ LDLIBS +=       -L$(ROOT)/usr/lib/picl/plugins
 LDLIBS +=	-L$(SRC)/lib/libptree/$(MACH)
 LDLIBS +=       -lc -lpicltree -lpicldevtree
 DYNFLAGS +=	-R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins
-LINTFLAGS +=	-L$(SRC)/lib/libptree/$(MACH) -lpicltree
 
 .KEEP_STATE:
 
@@ -77,7 +73,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS) $(CONF)
@@ -99,7 +94,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ
 include $(SRC)/lib/Makefile.targ
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile
index c1a0ec767c..e9589f5d17 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcplugin/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libpsvcplugin_psr.a
 VERS=		.1
@@ -45,8 +43,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-280R
 
 ROOTLIBDIR =	$(ROOT_PLAT_PLUGINDIR)
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 CPPFLAGS +=	-I$(SRC)/uts/sun4u
 CPPFLAGS +=	-I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj
 CPPFLAGS +=	-D_REENTRANT
@@ -59,8 +55,6 @@ DYNFLAGS +=	-R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib
 
 LDLIBS +=	-lc -lpicltree -lpicl -lpsvcobj -lpsvcplugin
 
-LINTFLAGS +=
-
 .KEEP_STATE:
 
 SUBDIRS=
@@ -72,7 +66,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS)
@@ -94,7 +87,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.targ
 include $(SRC)/lib/Makefile.targ
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile
index e867640d53..57dbd4e21d 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/psvcpolicy/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libpsvcpolicy_psr.a
 VERS=		.1
@@ -43,8 +41,6 @@ LIBS =		$(DYNLIB)
 
 PLATFORM=SUNW,Sun-Fire-280R
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 CPPFLAGS +=	-I$(SRC)/uts/sun4u
 CPPFLAGS +=	-I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj
 CPPFLAGS +=	-D_REENTRANT
@@ -57,9 +53,7 @@ LDLIBS +=	-L$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcplugin
 DYNFLAGS +=	-R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins:/usr/platform/sun4u/lib
 
 LDLIBS +=	-lpicltree -lpsvcobj -lpsvcplugin
-LDLIBS +=	-lc -ldevice 
-
-LINTFLAGS +=
+LDLIBS +=	-lc -ldevice
 
 .KEEP_STATE:
 
@@ -76,7 +70,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS)
@@ -107,7 +100,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
 	$(SYMLINK) ./libpsvcpolicy_psr.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy_psr.so
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)