mergegcc9

3 files changed, 4 insertions, 26 deletions

diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile
index 45048a9e68..c7e3de6004 100644
--- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcobj/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=	libpsvcobj.a
 VERS=		.1
@@ -45,15 +43,11 @@ PLATFORM = sun4u
 
 USR_PLAT_PSVCOBJ = $(LIBS:%=$(USR_PSM_LIB_DIR)/%)
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 CPPFLAGS +=	-I$(SRC)/uts/sun4u -I.
 
 CFLAGS +=	$(CCVERBOSE)
 LDLIBS +=	-L$(SRC)/lib/libdevfsevent
-LDLIBS +=	-lc 
-
-LINTFLAGS +=
+LDLIBS +=	-lc
 
 # definitions for install_h target
 HDRS=		psvc_objects.h
@@ -70,7 +64,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS)
@@ -90,7 +83,7 @@ include $(SRC)/lib/Makefile.targ
 
 $(USR_PSM_LIB_DIR):	FRC
 	$(INS.dir)
- 
+
 $(USR_PSM_INCL_DIR)/%: %
 	$(INS.file)
 
@@ -100,7 +93,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
 	$(SYMLINK) ./libpsvcobj.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcobj.so
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
index 8beda734ab..0f2e5104ef 100644
--- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
@@ -58,8 +58,6 @@ USR_PLAT_PLUGINS_DYNLIBS = $(PLAT_PLUGINS_DIRS:%=%/$(DYNLIB))
 USR_PLAT_PLUGINS_LIBLINKS = $(PLAT_PLUGINS_DIRS:%=%/$(LIBLINKS))
 LNECK_DYNLIB_DIR = ../../../../SUNW,Sun-Fire-280R/lib/picl/plugins
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 CPPFLAGS +=	-I$(SRC)/uts/sun4u
 CPPFLAGS +=	-I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj
 
@@ -71,7 +69,6 @@ LDLIBS +=	-R/usr/platform/sun4u/lib
 LDLIBS +=	-lc -lpicltree -lpicl -lpsvcobj
 
 DYNFLAGS +=	-Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
-LINTFLAGS +=
 
 .KEEP_STATE:
 
@@ -83,7 +80,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS)
@@ -131,7 +127,6 @@ $(USR_PLAT_PLUGINS_LIBLINKS): $(PLAT_PLUGINS_DIRS)
 	$(SYMLINK) $(LNECK_DYNLIB_DIR)/$(DYNLIB) $@
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile
index c33ecf85d9..45537c0dc7 100644
--- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile
@@ -23,10 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/picl/plugins/sun4u/psvc/psvcpolicy/Makefile
-#
+
 LIBRARY=	libpsvcpolicy.a
 VERS=		.1
 
@@ -46,12 +43,10 @@ PLATFORM = sun4u
 
 USR_PLAT_PSVCPOL = $(LIBS:%=$(USR_PSM_LIB_DIR)/%)
 
-CLEANFILES=	$(LINTOUT) $(LINTLIB)
-
 CPPFLAGS +=	-I$(SRC)/uts/sun4u
 CPPFLAGS +=	-I$(SRC)/cmd/picl/plugins/sun4u/psvc/psvcobj
 
-ZDEFS =		
+ZDEFS =
 CFLAGS +=	$(CCVERBOSE)
 LDLIBS +=	$(ZNODEFS)
 LDLIBS +=	-L$(SRC)/lib/libpicl/$(MACH) -L$(SRC)/lib/libpicltree/$(MACH)
@@ -62,8 +57,6 @@ LDLIBS +=	-lc -lpsvcobj -lpsvcplugin -lpicltree
 DYNFLAGS +=	-Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
 DYNFLAGS +=	-R/usr/platform/\$$PLATFORM/lib/picl/plugins:/usr/platform/sun4u/lib/picl/plugins:/usr/lib/picl/plugins:/usr/platform/sun4u/lib
 
-LINTFLAGS +=
-
 .KEEP_STATE:
 
 SUBDIRS=
@@ -74,7 +67,6 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 all: $(LIBS) $(LIBLINKS)
@@ -102,7 +94,6 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
 	$(SYMLINK) ./libpsvcpolicy.so$(VERS) $(USR_PSM_LIB_DIR)/libpsvcpolicy.so
 
 lint :
-	$(LINT.c) $(SRCS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)