mergegcc9

6 files changed, 17 insertions, 18 deletions

diff --git a/usr/src/lib/libeti/panel/Makefile b/usr/src/lib/libeti/panel/Makefile
index d39c71495b..70d8a0ac35 100644
--- a/usr/src/lib/libeti/panel/Makefile
+++ b/usr/src/lib/libeti/panel/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
 
@@ -34,11 +32,10 @@ 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)
 
 # definitions for install_h target
 HDRS=		panel.h
diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com
index 2783c77ee4..02ccd30ee2 100644
--- a/usr/src/lib/libeti/panel/Makefile.com
+++ b/usr/src/lib/libeti/panel/Makefile.com
@@ -39,23 +39,27 @@ OBJECTS=  \
 # include library definitions
 include ../../../Makefile.lib
 
-LIBS =          $(DYNLIB) $(LINTLIB)
+LIBS =          $(DYNLIB)
 
 SRCDIR=		../common
 
-$(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
-
 CPPFLAGS +=	-I../inc
 CFLAGS +=       $(CCVERBOSE)
 LDLIBS +=       -lcurses -lc
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+COMPATLINKS=	usr/ccs/lib/libpanel.so
+COMPATLINKS64=	usr/ccs/lib/$(MACH64)/libpanel.so
+
+$(ROOT)/usr/ccs/lib/libpanel.so:=	COMPATLINKTARGET=../../lib/libpanel.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libpanel.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
 
 # include library targets
 include ../../../Makefile.targ
diff --git a/usr/src/lib/libeti/panel/amd64/Makefile b/usr/src/lib/libeti/panel/amd64/Makefile
index 04160e850a..a2b9ee510c 100644
--- a/usr/src/lib/libeti/panel/amd64/Makefile
+++ b/usr/src/lib/libeti/panel/amd64/Makefile
@@ -22,7 +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
@@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/libeti/panel/i386/Makefile b/usr/src/lib/libeti/panel/i386/Makefile
index 775621cd27..fa3f9786e2 100644
--- a/usr/src/lib/libeti/panel/i386/Makefile
+++ b/usr/src/lib/libeti/panel/i386/Makefile
@@ -22,11 +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
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libeti/panel/sparc/Makefile b/usr/src/lib/libeti/panel/sparc/Makefile
index 775621cd27..fa3f9786e2 100644
--- a/usr/src/lib/libeti/panel/sparc/Makefile
+++ b/usr/src/lib/libeti/panel/sparc/Makefile
@@ -22,11 +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
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \
+	$(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/libeti/panel/sparcv9/Makefile b/usr/src/lib/libeti/panel/sparcv9/Makefile
index 04160e850a..a2b9ee510c 100644
--- a/usr/src/lib/libeti/panel/sparcv9/Makefile
+++ b/usr/src/lib/libeti/panel/sparcv9/Makefile
@@ -22,7 +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
@@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)