[illumos-gate merge]

commit 3052595ab8ddcc51231d239415b5eba5d913d45b
    11807 "private use area" characters should be marked as "printable"
commit cd61ae21816e53b94bc1673f3f1aa651fc3115e8
    12447 should install library compat symlinks from library makefiles, not Targetdirs
commit 241c90a06e8d1708235651863df515a2d522a03a
    12454 remove lint library machinery
commit 282d4a2d330d797757f16d55e1df9569f3e52d10
    12666 libproc manpage bugs
commit d906f494f9407f1ae043a922478ce3609959caf5
    12670 Unaligned output of snoop's usage() function
commit 18c4eaf123da22eddbe6e9a4ba7b8115ba748075
    12669 Add omitted word in vmstat man page
commit b68ab351091d2aea3f72a011f64de12fb05fc833
    12028 zfs test mdb_001_pos can fail

	Conflicts:
	usr/src/lib/nsswitch/dns/Makefile.com
	usr/src/lib/libsff/Makefile
	usr/src/lib/brand/Makefile
	usr/src/lib/Makefile.lib
	usr/src/lib/Makefile.targ

7 files changed, 7 insertions, 22 deletions

diff --git a/usr/src/lib/libctf/Makefile b/usr/src/lib/libctf/Makefile
index 5a8b3f9ed4..e89f63cba8 100644
--- a/usr/src/lib/libctf/Makefile
+++ b/usr/src/lib/libctf/Makefile
@@ -22,26 +22,23 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.lib
 
 HDRS = libctf.h
 HDRDIR = common
 
-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 lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
diff --git a/usr/src/lib/libctf/Makefile.com b/usr/src/lib/libctf/Makefile.com
index 0169c2a367..45c2cd3117 100644
--- a/usr/src/lib/libctf/Makefile.com
+++ b/usr/src/lib/libctf/Makefile.com
@@ -30,7 +30,6 @@ include ../../Makefile.rootfs
 
 all: $(LIBS)
 
-lint: lintcheck
 
 include ../../Makefile.targ
 include ../Makefile.shared.targ
diff --git a/usr/src/lib/libctf/Makefile.shared.com b/usr/src/lib/libctf/Makefile.shared.com
index 39100e6831..76cfd00da4 100644
--- a/usr/src/lib/libctf/Makefile.shared.com
+++ b/usr/src/lib/libctf/Makefile.shared.com
@@ -70,11 +70,10 @@ SRCS = \
 	$(LIST_OBJS:%.o=$(SRC)/common/list/%.c) \
 	$(MERGEQ_OBJS:%.o=$(SRC)/lib/mergeq/%.c)
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 LDLIBS += -lc -lelf -ldwarf -lavl
 
 CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
 
 SRCDIR = $(SRC)/lib/libctf/common
 
@@ -86,5 +85,3 @@ CPPFLAGS +=	-I$(SRC)/lib/libctf/common	\
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN += $(CNOWARN_UNINIT)
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libctf/amd64/Makefile b/usr/src/lib/libctf/amd64/Makefile
index c9bd26cfd3..a48c536235 100644
--- a/usr/src/lib/libctf/amd64/Makefile
+++ b/usr/src/lib/libctf/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) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libctf/i386/Makefile b/usr/src/lib/libctf/i386/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libctf/i386/Makefile
+++ b/usr/src/lib/libctf/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) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libctf/sparc/Makefile b/usr/src/lib/libctf/sparc/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libctf/sparc/Makefile
+++ b/usr/src/lib/libctf/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) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libctf/sparcv9/Makefile b/usr/src/lib/libctf/sparcv9/Makefile
index c9bd26cfd3..a48c536235 100644
--- a/usr/src/lib/libctf/sparcv9/Makefile
+++ b/usr/src/lib/libctf/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) $(ROOTCOMPATLINKS64)