mergegcc9

8 files changed, 13 insertions, 29 deletions

diff --git a/usr/src/lib/udapl/Makefile b/usr/src/lib/udapl/Makefile
index 142425232c..1ada445929 100644
--- a/usr/src/lib/udapl/Makefile
+++ b/usr/src/lib/udapl/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.lib
 
 SUBDIRS =	libdat udapl_tavor
 
-HDRSUBDIRS = 	libdat
+HDRSUBDIRS =	libdat
 
 all	:= TARGET = all
 clean	:= TARGET = clean
@@ -35,12 +35,11 @@ clobber	:= TARGET = clobber
 check	:= TARGET = check
 install	:= TARGET = install
 install_h := TARGET = install_h
-lint	:= TARGET = lint
 debug := TARGET = debug
 
 .KEEP_STATE:
 
-all debug clean clobber lint: $(SUBDIRS)
+all debug clean clobber: $(SUBDIRS)
 
 install: $(ROOTDIRS) $(SUBDIRS)
 
diff --git a/usr/src/lib/udapl/libdat/Makefile b/usr/src/lib/udapl/libdat/Makefile
index 6c5caac2a0..ae285cf4a9 100644
--- a/usr/src/lib/udapl/libdat/Makefile
+++ b/usr/src/lib/udapl/libdat/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,19 +40,18 @@ HDRS =	\
 HDRDIR = include/dat
 ROOTHDRDIR = $(ROOT)/usr/include/dat
 
-ROOTETC = 	$(ROOT)/etc
+ROOTETC =	$(ROOT)/etc
 ROOTETCDAT =	$(ROOTETC)/dat
 ETCDATFILES =	dat.conf
 ROOTETCDATFILES =	$(ETCDATFILES:%=$(ROOTETCDAT)/%)
 
-SUBDIRS =	$(MACH) 
+SUBDIRS =	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 debug :=	TARGET= debug
 
 .KEEP_STATE:
@@ -63,7 +60,7 @@ all debug install: $(ROOTETCDATFILES) .WAIT $(SUBDIRS)
 
 $(ROOTETCDATFILES): $(ROOTETCDAT)
 
-clean clobber lint: $(SUBDIRS)
+clean clobber: $(SUBDIRS)
 
 install_h: $(ROOTHDRDIR) .WAIT $(ROOTHDRS)
 
diff --git a/usr/src/lib/udapl/libdat/amd64/Makefile b/usr/src/lib/udapl/libdat/amd64/Makefile
index 8f6502f508..98037e49f2 100644
--- a/usr/src/lib/udapl/libdat/amd64/Makefile
+++ b/usr/src/lib/udapl/libdat/amd64/Makefile
@@ -23,10 +23,8 @@
 # Copyright 2004 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
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/udapl/libdat/i386/Makefile b/usr/src/lib/udapl/libdat/i386/Makefile
index af76f5ab90..18584b4da1 100644
--- a/usr/src/lib/udapl/libdat/i386/Makefile
+++ b/usr/src/lib/udapl/libdat/i386/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/udapl/libdat/sparc/Makefile b/usr/src/lib/udapl/libdat/sparc/Makefile
index 87230ec4fa..e129d9ceb8 100644
--- a/usr/src/lib/udapl/libdat/sparc/Makefile
+++ b/usr/src/lib/udapl/libdat/sparc/Makefile
@@ -23,9 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/udapl/libdat/sparcv9/Makefile b/usr/src/lib/udapl/libdat/sparcv9/Makefile
index febc6d01a2..fd924c576d 100644
--- a/usr/src/lib/udapl/libdat/sparcv9/Makefile
+++ b/usr/src/lib/udapl/libdat/sparcv9/Makefile
@@ -23,10 +23,8 @@
 # Copyright 2003 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
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile b/usr/src/lib/udapl/udapl_tavor/Makefile
index 71042e1c97..f19cbc3440 100644
--- a/usr/src/lib/udapl/udapl_tavor/Makefile
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile
@@ -26,20 +26,19 @@
 
 include $(SRC)/lib/Makefile.lib
 
-ROOTUSR = 	$(ROOT)/usr
-ROOTUSRSHARE = 	$(ROOTUSR)/share
+ROOTUSR =	$(ROOT)/usr
+ROOTUSRSHARE =	$(ROOTUSR)/share
 ROOTUSRSHAREDAT =	$(ROOTUSRSHARE)/dat
 CONFFILES =	SUNWudaplt.conf
 ROOTCONFFILES =	$(CONFFILES:%=$(ROOTUSRSHAREDAT)/%)
 
-SUBDIRS =	$(MACH) 
+SUBDIRS =	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 debug :=	TARGET= debug
 
 .KEEP_STATE:
@@ -48,7 +47,7 @@ all debug install: $(ROOTCONFFILES) .WAIT $(SUBDIRS)
 
 $(ROOTCONFFILES): $(ROOTUSRSHAREDAT)
 
-clean clobber lint: $(SUBDIRS)
+clean clobber: $(SUBDIRS)
 
 install_h:
 
diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile.com b/usr/src/lib/udapl/udapl_tavor/Makefile.com
index e6276a203d..424d196fa5 100644
--- a/usr/src/lib/udapl/udapl_tavor/Makefile.com
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com
@@ -146,8 +146,6 @@ CPPFLAGS +=	-I$(SRC)/uts/common/sys/ib/clients/daplt
 CPPFLAGS +=	-I$(SRC)/uts/common
 CPPFLAGS +=	-I$(SRC)/uts/common/sys/ib/clients
 CFLAGS +=	$(CCVERBOSE)
-LINTFLAGS +=	-DDAPL_DBG
-LINTFLAGS64 +=	-DDAPL_DBG
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	$(CNOWARN_UNINIT)
@@ -165,7 +163,6 @@ all: $(LIBS)
 
 debug: all
 
-lint: lintcheck
 
 pics/%.o: $(TAVORSRCDIR)/%.c
 	$(COMPILE.c) -o $@ $<