mergegcc9

7 files changed, 21 insertions, 32 deletions

diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile
index 2e9e919762..2433a55436 100644
--- a/usr/src/lib/libresolv2/Makefile
+++ b/usr/src/lib/libresolv2/Makefile
@@ -47,10 +47,9 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
-LIBRARY= 	libresolv.a
+LIBRARY=	libresolv.a
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a
 POFILE=		$(LIBRARY:.a=.po)
@@ -61,7 +60,7 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean clobber: $(SUBDIRS)
 
 install: $(SUBDIRS) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
 
@@ -71,11 +70,11 @@ $(MANIFESTDIR):
 	$(INS.dir)
 
 $(MANIFESTDIR)/%: %
-	$(INS.file)                                                             
+	$(INS.file)
 $(ROOTSVCMETHOD): $(SVCMETHODDIR)
 
 $(SVCMETHODDIR):
-	$(INS.dir) 
+	$(INS.dir)
 
 $(SVCMETHODDIR)/%: %
 	$(INS.file)
diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com
index 35e1eca77c..febdc71e86 100644
--- a/usr/src/lib/libresolv2/Makefile.com
+++ b/usr/src/lib/libresolv2/Makefile.com
@@ -27,7 +27,7 @@
 LIBRARY= libresolv.a
 VERS= .2
 
-BSDOBJS=   	putenv.o	strcasecmp.o	strsep.o \
+BSDOBJS=	putenv.o	strcasecmp.o	strsep.o \
 		ftruncate.o	readv.o		strdup.o	strtoul.o \
 		gettimeofday.o	setenv.o	strerror.o	utimes.o \
 		mktemp.o	setitimer.o	strpbrk.o	writev.o
@@ -36,30 +36,30 @@ DSTOBJS=	dst_api.o	support.o	hmac_link.o
 
 # inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with
 # libnsl
-INETOBJS= 	inet_net_pton.o	inet_neta.o	inet_lnaof.o \
-		inet_netof.o 	nsap_addr.o	inet_makeaddr.o	\
+INETOBJS=	inet_net_pton.o	inet_neta.o	inet_lnaof.o \
+		inet_netof.o	nsap_addr.o	inet_makeaddr.o	\
 		inet_network.o	inet_net_ntop.o	inet_cidr_ntop.o \
-		inet_cidr_pton.o 		inet_data.o
+		inet_cidr_pton.o		inet_data.o
 
 # build only the IRS objects that the ISC libbind's make would
-IRSTHROBJS=	gethostent_r.o	getnetent_r.o 	getnetgrent_r.o \
+IRSTHROBJS=	gethostent_r.o	getnetent_r.o	getnetgrent_r.o \
 		getprotoent_r.o	getservent_r.o
 IRSOBJS=	${IRSTHROBJS} \
 		dns.o		dns_ho.o	dns_nw.o	dns_pr.o \
 		dns_sv.o	gai_strerror.o	gen.o		gen_ho.o \
 		gen_ng.o	gen_nw.o	gen_pr.o	gen_sv.o \
 		getaddrinfo.o	gethostent.o	getnameinfo.o	getnetent.o \
-		getnetgrent.o	getprotoent.o	getservent.o 	hesiod.o \
-		irp.o		irp_ho.o	irp_ng.o 	irp_nw.o \
+		getnetgrent.o	getprotoent.o	getservent.o	hesiod.o \
+		irp.o		irp_ho.o	irp_ng.o	irp_nw.o \
 		irp_pr.o	irp_sv.o	irpmarshall.o	irs_data.o \
 		lcl.o		lcl_ho.o	lcl_ng.o	lcl_nw.o \
-		lcl_pr.o 	lcl_sv.o	nis.o		nul_ng.o \
+		lcl_pr.o	lcl_sv.o	nis.o		nul_ng.o \
 		util.o
 
 ISCOBJS=	assertions.o	base64.o	bitncmp.o	ctl_clnt.o \
-		ctl_p.o 	ctl_srvr.o	ev_connects.o	ev_files.o \
+		ctl_p.o		ctl_srvr.o	ev_connects.o	ev_files.o \
 		ev_streams.o	ev_timers.o	ev_waits.o	eventlib.o \
-		heap.o		hex.o 		logging.o	memcluster.o \
+		heap.o		hex.o		logging.o	memcluster.o \
 		movefile.o	tree.o
 
 NAMESEROBJS=	ns_date.o	ns_name.o	ns_netint.o	ns_parse.o \
@@ -95,9 +95,8 @@ SRCS=		$(BSDOBJS:%.o=../common/bsd/%.c) \
 		$(RESOLVOBJS:%.o=../common/resolv/%.c) \
 		$(SUNWOBJS:%.o=../common/sunw/%.c)
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 
-$(LINTLIB):= 	SRCS = ../common/llib-lresolv
 
 # Local Libresolv definitions
 
@@ -123,7 +122,6 @@ LDLIBS +=	-lsocket -lnsl -lc -lmd
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
 # include library targets
 include ../../Makefile.targ
@@ -159,7 +157,3 @@ pics/%.o: ../common/resolv/%.c
 pics/%.o: ../common/sunw/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
-
-# install rule for lint library target
-$(ROOTLINTDIR)/%:	../common/%
-	$(INS.file)
diff --git a/usr/src/lib/libresolv2/amd64/Makefile b/usr/src/lib/libresolv2/amd64/Makefile
index 2e8cdecf75..6782495649 100644
--- a/usr/src/lib/libresolv2/amd64/Makefile
+++ b/usr/src/lib/libresolv2/amd64/Makefile
@@ -22,10 +22,10 @@
 # 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)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libresolv2/i386/Makefile b/usr/src/lib/libresolv2/i386/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libresolv2/i386/Makefile
+++ b/usr/src/lib/libresolv2/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/libresolv2/include/Makefile b/usr/src/lib/libresolv2/include/Makefile
index b7271c0617..bdc41c7d19 100644
--- a/usr/src/lib/libresolv2/include/Makefile
+++ b/usr/src/lib/libresolv2/include/Makefile
@@ -36,7 +36,7 @@ install :=	TARGET= install
 
 .KEEP_STATE:
 
-all lint: $(HDRS)
+all: $(HDRS)
 
 install: all
 
diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile
index a333224278..cf2087e71e 100644
--- a/usr/src/lib/libresolv2/sparc/Makefile
+++ b/usr/src/lib/libresolv2/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/libresolv2/sparcv9/Makefile b/usr/src/lib/libresolv2/sparcv9/Makefile
index 2095629575..c88ec03a10 100644
--- a/usr/src/lib/libresolv2/sparcv9/Makefile
+++ b/usr/src/lib/libresolv2/sparcv9/Makefile
@@ -33,4 +33,4 @@ include ../../Makefile.lib.64
 
 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)