mergegcc9

7 files changed, 7 insertions, 23 deletions

diff --git a/usr/src/lib/libdtrace_jni/Makefile b/usr/src/lib/libdtrace_jni/Makefile
index 4287dc1a01..d78224ec62 100644
--- a/usr/src/lib/libdtrace_jni/Makefile
+++ b/usr/src/lib/libdtrace_jni/Makefile
@@ -22,25 +22,22 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.lib
 
-SUBDIRS = $(MACH) 
+SUBDIRS = $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all := TARGET = all
 clean := TARGET = clean
 clobber := TARGET = clobber
 install := TARGET = install
-lint := TARGET = lint
 
 .KEEP_STATE:
 
 all clean clobber install: java .WAIT $(SUBDIRS)
 
-lint: $(SUBDIRS)
+lint:
 
 install_h:
 
diff --git a/usr/src/lib/libdtrace_jni/Makefile.com b/usr/src/lib/libdtrace_jni/Makefile.com
index 8e4ca4a49b..0594c203bb 100644
--- a/usr/src/lib/libdtrace_jni/Makefile.com
+++ b/usr/src/lib/libdtrace_jni/Makefile.com
@@ -56,8 +56,6 @@ SMOFF += all_func_returns
 
 LDLIBS += -lc -luutil -ldtrace -lproc
 
-LINTLIB =
-
 LFLAGS = -t -v
 
 ROOTDLIBDIR = $(ROOT)/usr/lib/dtrace_jni
@@ -69,7 +67,6 @@ ROOTDLIBS = $(DLIBSRCS:%=$(ROOTDLIBDIR)/%)
 
 all: $(DYNLIB)
 
-lint: lintcheck
 
 %.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/lib/libdtrace_jni/amd64/Makefile b/usr/src/lib/libdtrace_jni/amd64/Makefile
index c9bd26cfd3..b13b247ca8 100644
--- a/usr/src/lib/libdtrace_jni/amd64/Makefile
+++ b/usr/src/lib/libdtrace_jni/amd64/Makefile
@@ -22,10 +22,8 @@
 # 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
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libdtrace_jni/i386/Makefile b/usr/src/lib/libdtrace_jni/i386/Makefile
index a333224278..282da97a76 100644
--- a/usr/src/lib/libdtrace_jni/i386/Makefile
+++ b/usr/src/lib/libdtrace_jni/i386/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2006 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/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile
index 3141eeaa90..0dbfe630d5 100644
--- a/usr/src/lib/libdtrace_jni/java/Makefile
+++ b/usr/src/lib/libdtrace_jni/java/Makefile
@@ -237,11 +237,9 @@ install:	all $(JARDESTDIR) $(INSJARS) $(DOCDESTDIR) \
 	$(DOCIMAGESDESTDIR)/JavaDTraceAPI.gif
 
 # empty targets for top-level building compatability
-
-install_h lint:
+install_h:
 
 # create API javadoc
-
 doc:
 		-@mkdir -p $(DOCAPI)
 		cd $(APIJAVASRC); umask 022; \
diff --git a/usr/src/lib/libdtrace_jni/sparc/Makefile b/usr/src/lib/libdtrace_jni/sparc/Makefile
index a333224278..282da97a76 100644
--- a/usr/src/lib/libdtrace_jni/sparc/Makefile
+++ b/usr/src/lib/libdtrace_jni/sparc/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2006 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/libdtrace_jni/sparcv9/Makefile b/usr/src/lib/libdtrace_jni/sparcv9/Makefile
index c9bd26cfd3..b13b247ca8 100644
--- a/usr/src/lib/libdtrace_jni/sparcv9/Makefile
+++ b/usr/src/lib/libdtrace_jni/sparcv9/Makefile
@@ -22,10 +22,8 @@
 # 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
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)