diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2019-07-04 01:48:24 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2020-05-04 16:57:13 -0400 |
| commit | cd61ae21816e53b94bc1673f3f1aa651fc3115e8 (patch) | |
| tree | 58f0148e78b6ea4e2e3d64cc45641c9f62d4e574 /usr/src/lib | |
| parent | 241c90a06e8d1708235651863df515a2d522a03a (diff) | |
| download | illumos-joyent-cd61ae21816e53b94bc1673f3f1aa651fc3115e8.tar.gz | |
12447 should install library compat symlinks from library makefiles, not Targetdirs
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
314 files changed, 736 insertions, 455 deletions
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index d36b608df9..b87923b006 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -119,12 +119,11 @@ $(ROOTDEMODIRS) := DIRMODE = 755 ARFLAGS= r SONAME= $(DYNLIB) + # For most libraries, we should be able to resolve all symbols at link time, # either within the library or as dependencies, all text should be pure, and # combining relocations into one relocation table reduces startup costs. # All options are tunable to allow overload/omission from lower makefiles. - - HSONAME= -h$(SONAME) DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ @@ -245,5 +244,16 @@ CLOBBERTARGFILES= $(LIBS) $(DYNLIB) $(CLOBBERFILES) TYPECHECK_LIB32 = $(TYPECHECK_LIB:%=$(MACH)/%) TYPECHECK_LIB64 = $(TYPECHECK_LIB:%=$(MACH64)/%) TYPECHECK_LIST= $(TYPELIST:%=-T %) -$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) +$(BUILD64)TYPECHECK.lib = $(CTFDIFF) -t -I $(TYPECHECK_LIST) \ + $(TYPECHECK_LIB32) $(TYPECHECK_LIB64) TYPECHECK = $(TYPECHECK_LIB:%=%.typecheck) + +# Links we need to create for compatibility +COMPATLINKS= +COMPATLINKS64= +ROOTCOMPATLINKS= $(COMPATLINKS:%=$(ROOT)/%) +ROOTCOMPATLINKS64= $(COMPATLINKS64:%=$(ROOT)/%) + +# So if someone doesn't set the target-specific variable they get a clue what +# went wrong. +COMPATLINKTARGET= /__you_didnt_use_COMPATLINKS_properly__ diff --git a/usr/src/lib/Makefile.mach b/usr/src/lib/Makefile.mach index cc200693ac..1e862d46ac 100644 --- a/usr/src/lib/Makefile.mach +++ b/usr/src/lib/Makefile.mach @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/Makefile.mach # + # included to define targets built with machine-dependent source # @@ -56,4 +54,10 @@ $(MACHLIBS): FRC $(MACHLIBS64): FRC @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F) +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + FRC: diff --git a/usr/src/lib/Makefile.rootfs b/usr/src/lib/Makefile.rootfs index c78894a551..b0aa7eec4d 100644 --- a/usr/src/lib/Makefile.rootfs +++ b/usr/src/lib/Makefile.rootfs @@ -22,11 +22,25 @@ # # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# + # To install libraries in the root filesystem (/lib), # include this Makefile right after Makefile.lib ROOTLIBDIR= $(ROOTFS_LIBDIR) ROOTLIBDIR64= $(ROOTFS_LIBDIR64) + + +# By default, libraries installed in /lib get a symbolic link added in +# /usr/lib for both the shared object and the compilation link. +COMPATLINKS= usr/lib/$(DYNLIB) \ + usr/lib/$(LIBLINKS) + +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB) \ + usr/lib/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/$(DYNLIB) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(LIBLINKS) := COMPATLINKTARGET=../../lib/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) +$(ROOT)/usr/lib/$(MACH64)/$(LIBLINKS) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB) diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ index 5a2e72e00e..a06499a5cb 100644 --- a/usr/src/lib/Makefile.targ +++ b/usr/src/lib/Makefile.targ @@ -101,5 +101,11 @@ clobber: clean -$(RM) $(CLOBBERTARGFILES) clean: - -$(RM) $(OBJS) - -$(RM) $(PICS) $(DUPLICATE_SRC) $(CLEANFILES) + -$(RM) $(OBJS) $(PICS) $(DUPLICATE_SRC) $(CLEANFILES) + +$(ROOTCOMPATLINKS): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + +$(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + diff --git a/usr/src/lib/README.Makefiles b/usr/src/lib/README.Makefiles index 3a41281d95..6db4c7ef6e 100644 --- a/usr/src/lib/README.Makefiles +++ b/usr/src/lib/README.Makefiles @@ -436,6 +436,19 @@ The third section typically consists of the following macros: necessary, and it should only contain optimization-related settings (or -g). + COMPATLINKS (if necessary) + + Set to a list of symbolic links that should also be provided for + this library. Each should also have a target-specific assignment to + COMPATLINKTARGET stating what the target of each link should be + + COMPATLINKS= usr/lib/libfoo.so + $(ROOT)/usr/lib/libfoo.so := COMPATLINKTARGET= libbar.so + + COMPATLINKS64 (if necessary) + + As COMPATLINKS, above, for 64bit objects. + Of course, you may use other macros as necessary. The fourth section typically consists of the following targets: @@ -539,6 +552,10 @@ Makefiles for libinetutil: install: all $(ROOTLIBS64) $(ROOTLINKS64) +If you included Makefile.rootfs to install your library into /lib, you should +also add $(ROOTCOMPATLINKS) and $(ROOTCOMPATLINKS64) to your install: target +to install compatibility symlinks into /usr/lib. + Observe that there is no .KEEP_STATE directive in these Makefiles, since all of these Makefiles include libinetutil/Makefile.com, and it already has a .KEEP_STATE directive. Also, note that the 64-bit Makefiles also include diff --git a/usr/src/lib/crt/Makefile.com b/usr/src/lib/crt/Makefile.com index 8415cf0cbe..70e5794cd0 100644 --- a/usr/src/lib/crt/Makefile.com +++ b/usr/src/lib/crt/Makefile.com @@ -59,6 +59,39 @@ $(COMMON_CRT) $(VALUES) := CFLAGS64 += $(C_PICFLAGS64) # intentional double exit SMOFF += unreachable +COMPATLINKS= usr/ccs/lib/values-Xa.o \ + usr/ccs/lib/values-Xc.o \ + usr/ccs/lib/values-Xs.o \ + usr/ccs/lib/values-Xt.o \ + usr/ccs/lib/values-xpg4.o \ + usr/ccs/lib/values-xpg6.o + +COMPATLINKS64= usr/ccs/lib/$(MACH64)/values-Xa.o \ + usr/ccs/lib/$(MACH64)/values-Xc.o \ + usr/ccs/lib/$(MACH64)/values-Xs.o \ + usr/ccs/lib/$(MACH64)/values-Xt.o \ + usr/ccs/lib/$(MACH64)/values-xpg4.o \ + usr/ccs/lib/$(MACH64)/values-xpg6.o + +$(ROOT)/usr/ccs/lib/values-Xa.o:= COMPATLINKTARGET=../../lib/values-Xa.o +$(ROOT)/usr/ccs/lib/values-Xc.o:= COMPATLINKTARGET=../../lib/values-Xc.o +$(ROOT)/usr/ccs/lib/values-Xs.o:= COMPATLINKTARGET=../../lib/values-Xs.o +$(ROOT)/usr/ccs/lib/values-Xt.o:= COMPATLINKTARGET=../../lib/values-Xt.o +$(ROOT)/usr/ccs/lib/values-xpg4.o:= COMPATLINKTARGET=../../lib/values-xpg4.o +$(ROOT)/usr/ccs/lib/values-xpg6.o:= COMPATLINKTARGET=../../lib/values-xpg6.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xa.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xc.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xs.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xt.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg4.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg6.o + .KEEP_STATE: all: $(OBJECTS) @@ -95,4 +128,5 @@ $(ROOTLIB64)/%.o: %.o $(ROOTLIB64)/gcrt1.o: $(RM) $(ROOTLIB64)/gcrt1.o; $(SYMLINK) crt1.o $(ROOTLIB64)/gcrt1.o -FRC: +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ diff --git a/usr/src/lib/crt/amd64/Makefile b/usr/src/lib/crt/amd64/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/amd64/Makefile +++ b/usr/src/lib/crt/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/crt/i386/Makefile b/usr/src/lib/crt/i386/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/i386/Makefile +++ b/usr/src/lib/crt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparc/Makefile b/usr/src/lib/crt/sparc/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/sparc/Makefile +++ b/usr/src/lib/crt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparcv9/Makefile b/usr/src/lib/crt/sparcv9/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/sparcv9/Makefile +++ b/usr/src/lib/crt/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index bf24e4c756..8ea99e219d 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -75,6 +75,21 @@ $(BUILD64)$(DYNLIB) := LDLIBS64 += -lumem -lnvpair -luutil -lsysevent \ CLEANFILES += ../common/fmev_errstring.c +COMPATLINKS = usr/lib/fm/$(DYNLIB) \ + usr/lib/fm/$(LIBLINKS) + +COMPATLINKS64 = usr/lib/fm/$(MACH64)/$(DYNLIB) \ + usr/lib/fm/$(MACH64)/$(LIBLINKS) + +$(ROOT)/usr/lib/fm/libfmevent.so.1 := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/libfmevent.so := \ + COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 +$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ + COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/fm/libfmevent/amd64/Makefile b/usr/src/lib/fm/libfmevent/amd64/Makefile index 34adaebb38..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/amd64/Makefile +++ b/usr/src/lib/fm/libfmevent/amd64/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/i386/Makefile b/usr/src/lib/fm/libfmevent/i386/Makefile index 991febf8ca..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/i386/Makefile +++ b/usr/src/lib/fm/libfmevent/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparc/Makefile b/usr/src/lib/fm/libfmevent/sparc/Makefile index 991febf8ca..36ac38389b 100644 --- a/usr/src/lib/fm/libfmevent/sparc/Makefile +++ b/usr/src/lib/fm/libfmevent/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparcv9/Makefile b/usr/src/lib/fm/libfmevent/sparcv9/Makefile index 34adaebb38..e3196f9733 100644 --- a/usr/src/lib/fm/libfmevent/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmevent/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libadm/amd64/Makefile b/usr/src/lib/libadm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libadm/amd64/Makefile +++ b/usr/src/lib/libadm/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libadm/i386/Makefile b/usr/src/lib/libadm/i386/Makefile index 7f8b80cc1a..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/i386/Makefile +++ b/usr/src/lib/libadm/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparc/Makefile b/usr/src/lib/libadm/sparc/Makefile index 7f8b80cc1a..3ec0fc6bb2 100644 --- a/usr/src/lib/libadm/sparc/Makefile +++ b/usr/src/lib/libadm/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libadm/sparcv9/Makefile b/usr/src/lib/libadm/sparcv9/Makefile index a4498e6166..e66fe7847d 100644 --- a/usr/src/lib/libadm/sparcv9/Makefile +++ b/usr/src/lib/libadm/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1998-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/libadm/sparcv9/Makefile # @@ -31,4 +31,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libaio/amd64/Makefile b/usr/src/lib/libaio/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/amd64/Makefile +++ b/usr/src/lib/libaio/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/i386/Makefile b/usr/src/lib/libaio/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libaio/i386/Makefile +++ b/usr/src/lib/libaio/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparc/Makefile b/usr/src/lib/libaio/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libaio/sparc/Makefile +++ b/usr/src/lib/libaio/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libaio/sparcv9/Makefile b/usr/src/lib/libaio/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libaio/sparcv9/Makefile +++ b/usr/src/lib/libaio/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libavl/amd64/Makefile b/usr/src/lib/libavl/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libavl/amd64/Makefile +++ b/usr/src/lib/libavl/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libavl/i386/Makefile b/usr/src/lib/libavl/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libavl/i386/Makefile +++ b/usr/src/lib/libavl/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparc/Makefile b/usr/src/lib/libavl/sparc/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libavl/sparc/Makefile +++ b/usr/src/lib/libavl/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libavl/sparcv9/Makefile b/usr/src/lib/libavl/sparcv9/Makefile index 0f67286356..164f1daab9 100644 --- a/usr/src/lib/libavl/sparcv9/Makefile +++ b/usr/src/lib/libavl/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libavl/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libbsm/amd64/Makefile b/usr/src/lib/libbsm/amd64/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/amd64/Makefile +++ b/usr/src/lib/libbsm/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/libbsm/i386/Makefile b/usr/src/lib/libbsm/i386/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libbsm/i386/Makefile +++ b/usr/src/lib/libbsm/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparc/Makefile b/usr/src/lib/libbsm/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libbsm/sparc/Makefile +++ b/usr/src/lib/libbsm/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libbsm/sparcv9/Makefile b/usr/src/lib/libbsm/sparcv9/Makefile index 2e8cdecf75..6782495649 100644 --- a/usr/src/lib/libbsm/sparcv9/Makefile +++ b/usr/src/lib/libbsm/sparcv9/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/libc/Makefile b/usr/src/lib/libc/Makefile index 7853c742c5..831425ecfd 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -45,6 +45,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc # include common library definitions include ../Makefile.lib +include ../Makefile.rootfs # # on some architectures, we build multiple libc variants @@ -92,7 +93,7 @@ $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64) LIBS = $(DYNLIB) -ROOTLIBS64= $(ROOTLIBDIR64)/$(DYNLIB) +ROOTLIBS64= $(ROOTLIB64)/$(DYNLIB) MACHLIBS64= $(MACH64)/$(DYNLIB) VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1) VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1) @@ -110,8 +111,8 @@ CLOBBERFILES += THIRDPARTYLICENSE extract-copyright $(ROOTHDRDIR)/%: port/gen/% $(INS.file) -$(ROOTLIBDIR)/$(DYNLIB) := FILEMODE = 755 -$(ROOTLIBDIR64)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB64)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR64)/$(DYNLIB) := FILEMODE = 755 @@ -165,7 +166,9 @@ $($(MACH)_COMP): FRC install: all \ etc \ inslib32 \ - $(BUILD64) inslib64 + $(ROOTCOMPATLINKS) + +$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64) inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS) @@ -177,15 +180,6 @@ all_h: $(MACH)/assym.h $(MACH64)/assym.h check: $(CHECKHDRS) -$(ROOTFS_LIB)/%: $(MACH)/% - $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) -$(ROOTFS_LIB64)/%: $(MACH64)/% - $(INS.file) -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink) - $(ROOTVARIANTDIR): $(ROOTLIB) $(INS.dir) $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/% @@ -233,5 +227,6 @@ cscope.out tags: FRC $(XREF) -x $@ FRC: + # include MACH-specific library targets include ../Makefile.mach diff --git a/usr/src/lib/libc_db/amd64/Makefile b/usr/src/lib/libc_db/amd64/Makefile index 9a111ae271..99231f7c40 100644 --- a/usr/src/lib/libc_db/amd64/Makefile +++ b/usr/src/lib/libc_db/amd64/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libc_db/i386/Makefile b/usr/src/lib/libc_db/i386/Makefile index 5bfc896a14..5e1faf8ef7 100644 --- a/usr/src/lib/libc_db/i386/Makefile +++ b/usr/src/lib/libc_db/i386/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparc/Makefile b/usr/src/lib/libc_db/sparc/Makefile index 2553929591..64b7326c93 100644 --- a/usr/src/lib/libc_db/sparc/Makefile +++ b/usr/src/lib/libc_db/sparc/Makefile @@ -30,4 +30,5 @@ include ../Makefile.com BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libc_db/sparcv9/Makefile b/usr/src/lib/libc_db/sparcv9/Makefile index ee65b634b0..6e0e5d6357 100644 --- a/usr/src/lib/libc_db/sparcv9/Makefile +++ b/usr/src/lib/libc_db/sparcv9/Makefile @@ -33,4 +33,5 @@ CPPFLAGS += -D_SYSCALL32 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS) -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcmdutils/amd64/Makefile b/usr/src/lib/libcmdutils/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libcmdutils/amd64/Makefile +++ b/usr/src/lib/libcmdutils/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcmdutils/i386/Makefile b/usr/src/lib/libcmdutils/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/i386/Makefile +++ b/usr/src/lib/libcmdutils/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparc/Makefile b/usr/src/lib/libcmdutils/sparc/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libcmdutils/sparc/Makefile +++ b/usr/src/lib/libcmdutils/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcmdutils/sparcv9/Makefile b/usr/src/lib/libcmdutils/sparcv9/Makefile index 8b7605f4cf..ceab7c0bdd 100644 --- a/usr/src/lib/libcmdutils/sparcv9/Makefile +++ b/usr/src/lib/libcmdutils/sparcv9/Makefile @@ -23,11 +23,11 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # lib/libcmdutils/sparcv9/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcontract/amd64/Makefile b/usr/src/lib/libcontract/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libcontract/amd64/Makefile +++ b/usr/src/lib/libcontract/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcontract/i386/Makefile b/usr/src/lib/libcontract/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libcontract/i386/Makefile +++ b/usr/src/lib/libcontract/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparc/Makefile b/usr/src/lib/libcontract/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libcontract/sparc/Makefile +++ b/usr/src/lib/libcontract/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcontract/sparcv9/Makefile b/usr/src/lib/libcontract/sparcv9/Makefile index cb39a2beff..2bbd813164 100644 --- a/usr/src/lib/libcontract/sparcv9/Makefile +++ b/usr/src/lib/libcontract/sparcv9/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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index 70b937cb7a..eb4db4b311 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -52,26 +52,24 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -include ../../Makefile.targ +COMPATLINKS = usr/lib/libcrypt_i.so$(VERS) \ + usr/lib/libcrypt_i.so \ + usr/lib/libcrypt_d.so$(VERS) \ + usr/lib/libcrypt_d.so -$(ROOTLINKS) := INS.liblink = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +COMPATLINKS64 = usr/lib/$(MACH64)/libcrypt_i.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_i.so \ + usr/lib/$(MACH64)/libcrypt_d.so$(VERS) \ + usr/lib/$(MACH64)/libcrypt_d.so -$(ROOTLINKS64) := INS.liblink64 = \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libcrypt_i.so$(VERS) libcrypt_i.so ;\ - $(RM) libcrypt_d.so$(VERS) libcrypt_d.so ;\ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_i.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_i.so; \ - $(SYMLINK) libcrypt.so$(VERS) libcrypt_d.so$(VERS); \ - $(SYMLINK) libcrypt.so libcrypt_d.so; +$(ROOT)/usr/lib/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_i.so := COMPATLINKTARGET= libcrypt.so +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so$(VERS) := COMPATLINKTARGET= libcrypt.so$(VERS) +$(ROOT)/usr/lib/$(MACH64)/libcrypt_d.so := COMPATLINKTARGET= libcrypt.so +include ../../Makefile.targ diff --git a/usr/src/lib/libcrypt/amd64/Makefile b/usr/src/lib/libcrypt/amd64/Makefile index 9dbcf2e982..410bdb818e 100644 --- a/usr/src/lib/libcrypt/amd64/Makefile +++ b/usr/src/lib/libcrypt/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/i386/Makefile b/usr/src/lib/libcrypt/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/i386/Makefile +++ b/usr/src/lib/libcrypt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparc/Makefile b/usr/src/lib/libcrypt/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libcrypt/sparc/Makefile +++ b/usr/src/lib/libcrypt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparcv9/Makefile b/usr/src/lib/libcrypt/sparcv9/Makefile index 87ac99efc1..14bdb8486d 100644 --- a/usr/src/lib/libcrypt/sparcv9/Makefile +++ b/usr/src/lib/libcrypt/sparcv9/Makefile @@ -23,11 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/sparc/Makefile include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libctf/amd64/Makefile b/usr/src/lib/libctf/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libctf/amd64/Makefile +++ b/usr/src/lib/libctf/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libctf/i386/Makefile b/usr/src/lib/libctf/i386/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libctf/i386/Makefile +++ b/usr/src/lib/libctf/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparc/Makefile b/usr/src/lib/libctf/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libctf/sparc/Makefile +++ b/usr/src/lib/libctf/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libctf/sparcv9/Makefile b/usr/src/lib/libctf/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libctf/sparcv9/Makefile +++ b/usr/src/lib/libctf/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com index 46a960e80a..2082f3b634 100644 --- a/usr/src/lib/libcurses/Makefile.com +++ b/usr/src/lib/libcurses/Makefile.com @@ -162,24 +162,37 @@ CLOBBERFILES= libcurses.so libcurses.so$(VERS) all: $(LIBS) - -# -# Install rules for libtermlib.so links. -# Augments the rule in Makefile.targ -# -$(ROOTLIBDIR)/$(LIBLINKS) := INS.liblink= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR); \ - $(RM) libtermlib.so libtermlib.so$(VERS); \ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; - -$(ROOTLIBDIR64)/$(LIBLINKS) := INS.liblink64= \ - $(RM) $@; $(SYMLINK) $(LIBLINKPATH)$(LIBLINKS)$(VERS) $@; \ - cd $(ROOTLIBDIR64); \ - $(RM) libtermlib.so libtermlib.so$(VERS);\ - $(SYMLINK) libcurses.so$(VERS) libtermlib.so$(VERS); \ - $(SYMLINK) libtermlib.so$(VERS) libtermlib.so; +COMPATLINKS += usr/ccs/lib/libcurses.so \ + usr/ccs/lib/libtermlib.so \ + usr/lib/libtermlib.so \ + usr/lib/libtermlib.so.1 \ + lib/libtermlib.so \ + lib/libtermlib.so.1 + +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libcurses.so \ + usr/ccs/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so \ + usr/lib/$(MACH64)/libtermlib.so.1 \ + lib/$(MACH64)/libtermlib.so \ + lib/$(MACH64)/libtermlib.so.1 + +$(ROOT)/usr/ccs/lib/libcurses.so := COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/libtermlib.so := \ + COMPATLINKTARGET=../../../lib/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so.1 := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/libtermlib.so := COMPATLINKTARGET= ../../lib/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/usr/lib/$(MACH64)/libtermlib.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1 +$(ROOT)/lib/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so.1 := COMPATLINKTARGET= libcurses.so.1 +$(ROOT)/lib/$(MACH64)/libtermlib.so := COMPATLINKTARGET= libtermlib.so.1 # # Include library targets diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/amd64/Makefile +++ b/usr/src/lib/libcurses/amd64/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcurses/i386/Makefile b/usr/src/lib/libcurses/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libcurses/i386/Makefile +++ b/usr/src/lib/libcurses/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparc/Makefile b/usr/src/lib/libcurses/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libcurses/sparc/Makefile +++ b/usr/src/lib/libcurses/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile index 57138967e0..81d2c84ed7 100644 --- a/usr/src/lib/libcurses/sparcv9/Makefile +++ b/usr/src/lib/libcurses/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevice/amd64/Makefile b/usr/src/lib/libdevice/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/amd64/Makefile +++ b/usr/src/lib/libdevice/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevice/i386/Makefile b/usr/src/lib/libdevice/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevice/i386/Makefile +++ b/usr/src/lib/libdevice/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparc/Makefile b/usr/src/lib/libdevice/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevice/sparc/Makefile +++ b/usr/src/lib/libdevice/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevice/sparcv9/Makefile b/usr/src/lib/libdevice/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevice/sparcv9/Makefile +++ b/usr/src/lib/libdevice/sparcv9/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/amd64/Makefile b/usr/src/lib/libdevid/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libdevid/amd64/Makefile +++ b/usr/src/lib/libdevid/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevid/i386/Makefile b/usr/src/lib/libdevid/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevid/i386/Makefile +++ b/usr/src/lib/libdevid/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparc/Makefile b/usr/src/lib/libdevid/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libdevid/sparc/Makefile +++ b/usr/src/lib/libdevid/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevid/sparcv9/Makefile b/usr/src/lib/libdevid/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libdevid/sparcv9/Makefile +++ b/usr/src/lib/libdevid/sparcv9/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/amd64/Makefile b/usr/src/lib/libdevinfo/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/amd64/Makefile +++ b/usr/src/lib/libdevinfo/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 @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdevinfo/i386/Makefile b/usr/src/lib/libdevinfo/i386/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/i386/Makefile +++ b/usr/src/lib/libdevinfo/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparc/Makefile b/usr/src/lib/libdevinfo/sparc/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libdevinfo/sparc/Makefile +++ b/usr/src/lib/libdevinfo/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdevinfo/sparcv9/Makefile b/usr/src/lib/libdevinfo/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/libdevinfo/sparcv9/Makefile +++ b/usr/src/lib/libdevinfo/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 @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/amd64/Makefile b/usr/src/lib/libdhcpagent/amd64/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/amd64/Makefile +++ b/usr/src/lib/libdhcpagent/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcpagent/i386/Makefile b/usr/src/lib/libdhcpagent/i386/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/i386/Makefile +++ b/usr/src/lib/libdhcpagent/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparc/Makefile b/usr/src/lib/libdhcpagent/sparc/Makefile index 64d377eef1..1b2c7a9afc 100644 --- a/usr/src/lib/libdhcpagent/sparc/Makefile +++ b/usr/src/lib/libdhcpagent/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcpagent/sparcv9/Makefile b/usr/src/lib/libdhcpagent/sparcv9/Makefile index 2b996f5855..f5b405d5a7 100644 --- a/usr/src/lib/libdhcpagent/sparcv9/Makefile +++ b/usr/src/lib/libdhcpagent/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/amd64/Makefile b/usr/src/lib/libdhcputil/amd64/Makefile index 7451cc1755..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/amd64/Makefile +++ b/usr/src/lib/libdhcputil/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdhcputil/i386/Makefile b/usr/src/lib/libdhcputil/i386/Makefile index fe079a23cb..236b63a452 100644 --- a/usr/src/lib/libdhcputil/i386/Makefile +++ b/usr/src/lib/libdhcputil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparc/Makefile b/usr/src/lib/libdhcputil/sparc/Makefile index fe079a23cb..236b63a452 100644 --- a/usr/src/lib/libdhcputil/sparc/Makefile +++ b/usr/src/lib/libdhcputil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdhcputil/sparcv9/Makefile b/usr/src/lib/libdhcputil/sparcv9/Makefile index 7451cc1755..4b5199cd4c 100644 --- a/usr/src/lib/libdhcputil/sparcv9/Makefile +++ b/usr/src/lib/libdhcputil/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdlpi/amd64/Makefile b/usr/src/lib/libdlpi/amd64/Makefile index a76ebb70e3..99ed908528 100644 --- a/usr/src/lib/libdlpi/amd64/Makefile +++ b/usr/src/lib/libdlpi/amd64/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma 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/libdlpi/i386/Makefile b/usr/src/lib/libdlpi/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libdlpi/i386/Makefile +++ b/usr/src/lib/libdlpi/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparc/Makefile b/usr/src/lib/libdlpi/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libdlpi/sparc/Makefile +++ b/usr/src/lib/libdlpi/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdlpi/sparcv9/Makefile b/usr/src/lib/libdlpi/sparcv9/Makefile index 600ff73f12..99ed908528 100644 --- a/usr/src/lib/libdlpi/sparcv9/Makefile +++ b/usr/src/lib/libdlpi/sparcv9/Makefile @@ -22,10 +22,10 @@ # Copyright 2007 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/libdoor/amd64/Makefile b/usr/src/lib/libdoor/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/amd64/Makefile +++ b/usr/src/lib/libdoor/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/i386/Makefile b/usr/src/lib/libdoor/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libdoor/i386/Makefile +++ b/usr/src/lib/libdoor/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparc/Makefile b/usr/src/lib/libdoor/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libdoor/sparc/Makefile +++ b/usr/src/lib/libdoor/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdoor/sparcv9/Makefile b/usr/src/lib/libdoor/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libdoor/sparcv9/Makefile +++ b/usr/src/lib/libdoor/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libdscp/sparc/Makefile b/usr/src/lib/libdscp/sparc/Makefile index 182e6180d4..5c4980a2bd 100644 --- a/usr/src/lib/libdscp/sparc/Makefile +++ b/usr/src/lib/libdscp/sparc/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 diff --git a/usr/src/lib/libdwarf/amd64/Makefile b/usr/src/lib/libdwarf/amd64/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/amd64/Makefile +++ b/usr/src/lib/libdwarf/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libdwarf/i386/Makefile b/usr/src/lib/libdwarf/i386/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/i386/Makefile +++ b/usr/src/lib/libdwarf/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparc/Makefile b/usr/src/lib/libdwarf/sparc/Makefile index 4398507523..dd7a697f17 100644 --- a/usr/src/lib/libdwarf/sparc/Makefile +++ b/usr/src/lib/libdwarf/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libdwarf/sparcv9/Makefile b/usr/src/lib/libdwarf/sparcv9/Makefile index 15a899f96f..a3d127a1e3 100644 --- a/usr/src/lib/libdwarf/sparcv9/Makefile +++ b/usr/src/lib/libdwarf/sparcv9/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/amd64/Makefile b/usr/src/lib/libefi/amd64/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libefi/amd64/Makefile +++ b/usr/src/lib/libefi/amd64/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libefi/i386/Makefile b/usr/src/lib/libefi/i386/Makefile index 7421a75150..a681a7f1a0 100644 --- a/usr/src/lib/libefi/i386/Makefile +++ b/usr/src/lib/libefi/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparc/Makefile b/usr/src/lib/libefi/sparc/Makefile index 7421a75150..a681a7f1a0 100644 --- a/usr/src/lib/libefi/sparc/Makefile +++ b/usr/src/lib/libefi/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libefi/sparcv9/Makefile b/usr/src/lib/libefi/sparcv9/Makefile index 58c362f541..309834ae94 100644 --- a/usr/src/lib/libefi/sparcv9/Makefile +++ b/usr/src/lib/libefi/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com index 46555e4310..5a9eae2ad9 100644 --- a/usr/src/lib/libeti/form/Makefile.com +++ b/usr/src/lib/libeti/form/Makefile.com @@ -77,6 +77,13 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts +COMPATLINKS= usr/ccs/lib/libform.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libform.so + +$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile index 4201c0bb20..5757f3b5ec 100644 --- a/usr/src/lib/libeti/form/amd64/Makefile +++ b/usr/src/lib/libeti/form/amd64/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile index 9e959ae552..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/i386/Makefile +++ b/usr/src/lib/libeti/form/i386/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile index 9e959ae552..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/sparc/Makefile +++ b/usr/src/lib/libeti/form/sparc/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile index 06a8dcb9bb..34a4272b2b 100644 --- a/usr/src/lib/libeti/form/sparcv9/Makefile +++ b/usr/src/lib/libeti/form/sparcv9/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com index 1b17cac70c..4964d9cb93 100644 --- a/usr/src/lib/libeti/menu/Makefile.com +++ b/usr/src/lib/libeti/menu/Makefile.com @@ -73,6 +73,13 @@ LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libmenu.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmenu.so + +$(ROOT)/usr/ccs/lib/libmenu.so := COMPATLINKTARGET= ../../lib/libmenu.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmenu.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libeti/menu/amd64/Makefile b/usr/src/lib/libeti/menu/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/amd64/Makefile +++ b/usr/src/lib/libeti/menu/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/menu/i386/Makefile b/usr/src/lib/libeti/menu/i386/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/i386/Makefile +++ b/usr/src/lib/libeti/menu/i386/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparc/Makefile b/usr/src/lib/libeti/menu/sparc/Makefile index 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/sparc/Makefile +++ b/usr/src/lib/libeti/menu/sparc/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparcv9/Makefile b/usr/src/lib/libeti/menu/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/sparcv9/Makefile +++ b/usr/src/lib/libeti/menu/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) diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com index f8c830fe70..02ccd30ee2 100644 --- a/usr/src/lib/libeti/panel/Makefile.com +++ b/usr/src/lib/libeti/panel/Makefile.com @@ -49,6 +49,13 @@ 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) 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 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/i386/Makefile +++ b/usr/src/lib/libeti/panel/i386/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +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 7db1ae8c3d..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/sparc/Makefile +++ b/usr/src/lib/libeti/panel/sparc/Makefile @@ -27,4 +27,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +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) diff --git a/usr/src/lib/libfakekernel/amd64/Makefile b/usr/src/lib/libfakekernel/amd64/Makefile index 6792bbc3bb..5039a0aea7 100644 --- a/usr/src/lib/libfakekernel/amd64/Makefile +++ b/usr/src/lib/libfakekernel/amd64/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfakekernel/i386/Makefile b/usr/src/lib/libfakekernel/i386/Makefile index d32f3f3fc2..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/i386/Makefile +++ b/usr/src/lib/libfakekernel/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparc/Makefile b/usr/src/lib/libfakekernel/sparc/Makefile index d32f3f3fc2..6c3e24318c 100644 --- a/usr/src/lib/libfakekernel/sparc/Makefile +++ b/usr/src/lib/libfakekernel/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfakekernel/sparcv9/Makefile b/usr/src/lib/libfakekernel/sparcv9/Makefile index e4445a2843..cbe3c9c9fb 100644 --- a/usr/src/lib/libfakekernel/sparcv9/Makefile +++ b/usr/src/lib/libfakekernel/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/amd64/Makefile index 8680082937..9704a84b6d 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libfdisk/i386/Makefile b/usr/src/lib/libfdisk/i386/Makefile index 47878e05bc..7857fc5e13 100644 --- a/usr/src/lib/libfdisk/i386/Makefile +++ b/usr/src/lib/libfdisk/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libfdisk/sparcv9/Makefile b/usr/src/lib/libfdisk/sparcv9/Makefile index 3df0cea286..c41dc63348 100644 --- a/usr/src/lib/libfdisk/sparcv9/Makefile +++ b/usr/src/lib/libfdisk/sparcv9/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com index 0a46c39508..79e6526fc3 100644 --- a/usr/src/lib/libgen/Makefile.com +++ b/usr/src/lib/libgen/Makefile.com @@ -49,6 +49,13 @@ CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off +COMPATLINKS += usr/ccs/lib/libgen.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libgen.so + +$(ROOT)/usr/ccs/lib/libgen.so := COMPATLINKTARGET=../../../lib/libgen.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libgen.so.1 + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libgen/amd64/Makefile b/usr/src/lib/libgen/amd64/Makefile index aeb9193cee..a21175e8a6 100644 --- a/usr/src/lib/libgen/amd64/Makefile +++ b/usr/src/lib/libgen/amd64/Makefile @@ -29,4 +29,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libgen/i386/Makefile b/usr/src/lib/libgen/i386/Makefile index 9223b1b398..4294af4b98 100644 --- a/usr/src/lib/libgen/i386/Makefile +++ b/usr/src/lib/libgen/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparc/Makefile b/usr/src/lib/libgen/sparc/Makefile index 9223b1b398..4294af4b98 100644 --- a/usr/src/lib/libgen/sparc/Makefile +++ b/usr/src/lib/libgen/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libgen/sparcv9/Makefile b/usr/src/lib/libgen/sparcv9/Makefile index a7f87e8a24..e09b255dd9 100644 --- a/usr/src/lib/libgen/sparcv9/Makefile +++ b/usr/src/lib/libgen/sparcv9/Makefile @@ -29,4 +29,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinetutil/amd64/Makefile b/usr/src/lib/libinetutil/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libinetutil/amd64/Makefile +++ b/usr/src/lib/libinetutil/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libinetutil/i386/Makefile b/usr/src/lib/libinetutil/i386/Makefile index 1c3d6f6f01..748553c12b 100644 --- a/usr/src/lib/libinetutil/i386/Makefile +++ b/usr/src/lib/libinetutil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparc/Makefile b/usr/src/lib/libinetutil/sparc/Makefile index 1c3d6f6f01..748553c12b 100644 --- a/usr/src/lib/libinetutil/sparc/Makefile +++ b/usr/src/lib/libinetutil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libinetutil/sparcv9/Makefile b/usr/src/lib/libinetutil/sparcv9/Makefile index 87e9702141..b9a9d5ad47 100644 --- a/usr/src/lib/libinetutil/sparcv9/Makefile +++ b/usr/src/lib/libinetutil/sparcv9/Makefile @@ -23,10 +23,10 @@ # Copyright (c) 2001 by Sun Microsystems, Inc. # All rights reserved. # -# 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/libintl/amd64/Makefile b/usr/src/lib/libintl/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/amd64/Makefile +++ b/usr/src/lib/libintl/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/i386/Makefile b/usr/src/lib/libintl/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libintl/i386/Makefile +++ b/usr/src/lib/libintl/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparc/Makefile b/usr/src/lib/libintl/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libintl/sparc/Makefile +++ b/usr/src/lib/libintl/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libintl/sparcv9/Makefile b/usr/src/lib/libintl/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libintl/sparcv9/Makefile +++ b/usr/src/lib/libintl/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libkstat/amd64/Makefile b/usr/src/lib/libkstat/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/amd64/Makefile +++ b/usr/src/lib/libkstat/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 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libkstat/i386/Makefile b/usr/src/lib/libkstat/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libkstat/i386/Makefile +++ b/usr/src/lib/libkstat/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparc/Makefile b/usr/src/lib/libkstat/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libkstat/sparc/Makefile +++ b/usr/src/lib/libkstat/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libkstat/sparcv9/Makefile b/usr/src/lib/libkstat/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libkstat/sparcv9/Makefile +++ b/usr/src/lib/libkstat/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 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libm/amd64/Makefile b/usr/src/lib/libm/amd64/Makefile index c67cf5c91d..2e245b6732 100644 --- a/usr/src/lib/libm/amd64/Makefile +++ b/usr/src/lib/libm/amd64/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm/i386/Makefile b/usr/src/lib/libm/i386/Makefile index cad07fb1c6..89754fc049 100644 --- a/usr/src/lib/libm/i386/Makefile +++ b/usr/src/lib/libm/i386/Makefile @@ -23,6 +23,6 @@ include ../Makefile.com CFLAGS += -_gcc=-ffloat-store $(OBJS_M9XSSE) := CFLAGS += -xarch=sse2 -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparc/Makefile b/usr/src/lib/libm/sparc/Makefile index 5a51957971..5c5fc318b8 100644 --- a/usr/src/lib/libm/sparc/Makefile +++ b/usr/src/lib/libm/sparc/Makefile @@ -18,6 +18,6 @@ include ../Makefile.com CHIP = ultra -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libm/sparcv9/Makefile b/usr/src/lib/libm/sparcv9/Makefile index 91181acd63..ec82c4d735 100644 --- a/usr/src/lib/libm/sparcv9/Makefile +++ b/usr/src/lib/libm/sparcv9/Makefile @@ -20,6 +20,6 @@ include $(SRC)/lib/Makefile.lib.64 CHIP = ultra -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libm1/Makefile.com b/usr/src/lib/libm1/Makefile.com index b87f60bf9d..5672bea95b 100644 --- a/usr/src/lib/libm1/Makefile.com +++ b/usr/src/lib/libm1/Makefile.com @@ -33,6 +33,9 @@ CPPFLAGS += -DLIBM_BUILD MAPFILEDIR = ../common/ DYNFLAGS += -zignore -Wl,-F'libm.so.2' +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libm1/amd64/Makefile b/usr/src/lib/libm1/amd64/Makefile index 21fab0dd1c..00367a883c 100644 --- a/usr/src/lib/libm1/amd64/Makefile +++ b/usr/src/lib/libm1/amd64/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= amd64 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/i386/Makefile b/usr/src/lib/libm1/i386/Makefile index 3d2c71860a..3b1f60dcde 100644 --- a/usr/src/lib/libm1/i386/Makefile +++ b/usr/src/lib/libm1/i386/Makefile @@ -16,6 +16,6 @@ TARGET_ARCH= i386 include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparc/Makefile b/usr/src/lib/libm1/sparc/Makefile index 686bb12ef2..867aeaa331 100644 --- a/usr/src/lib/libm1/sparc/Makefile +++ b/usr/src/lib/libm1/sparc/Makefile @@ -17,6 +17,6 @@ TARGET_ARCH= sparc include ../Makefile.com -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libm1/sparcv9/Makefile b/usr/src/lib/libm1/sparcv9/Makefile index 4899efe7b7..cf688d8ba6 100644 --- a/usr/src/lib/libm1/sparcv9/Makefile +++ b/usr/src/lib/libm1/sparcv9/Makefile @@ -18,6 +18,6 @@ TARGET_ARCH= sparcv9 include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmalloc/Makefile.com b/usr/src/lib/libmalloc/Makefile.com index 6faf62851f..f7f9942f8d 100644 --- a/usr/src/lib/libmalloc/Makefile.com +++ b/usr/src/lib/libmalloc/Makefile.com @@ -41,6 +41,13 @@ CPPFLAGS += -I../../common/inc -D_REENTRANT DYNFLAGS += $(ZINTERPOSE) LDLIBS += -lc +COMPATLINKS= usr/ccs/lib/libmalloc.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmalloc.so + +$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1 + .KEEP_STATE: diff --git a/usr/src/lib/libmalloc/amd64/Makefile b/usr/src/lib/libmalloc/amd64/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/amd64/Makefile +++ b/usr/src/lib/libmalloc/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 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmalloc/i386/Makefile b/usr/src/lib/libmalloc/i386/Makefile index 211da0bfff..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/i386/Makefile +++ b/usr/src/lib/libmalloc/i386/Makefile @@ -29,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparc/Makefile b/usr/src/lib/libmalloc/sparc/Makefile index 211da0bfff..3d6e266f97 100644 --- a/usr/src/lib/libmalloc/sparc/Makefile +++ b/usr/src/lib/libmalloc/sparc/Makefile @@ -29,4 +29,5 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmalloc/sparcv9/Makefile b/usr/src/lib/libmalloc/sparcv9/Makefile index d50a21bdb0..01c18f35a7 100644 --- a/usr/src/lib/libmalloc/sparcv9/Makefile +++ b/usr/src/lib/libmalloc/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 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile index 8f311a064c..aab8d061a9 100644 --- a/usr/src/lib/libmd/amd64/Makefile +++ b/usr/src/lib/libmd/amd64/Makefile @@ -59,8 +59,7 @@ AS_CPPFLAGS += -D_ASM all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) - +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/%.o: %.s $(COMPILE.s) -o $@ ${@F:.o=.s} diff --git a/usr/src/lib/libmd/i386/Makefile b/usr/src/lib/libmd/i386/Makefile index 444ddc5911..c8e385093a 100644 --- a/usr/src/lib/libmd/i386/Makefile +++ b/usr/src/lib/libmd/i386/Makefile @@ -38,7 +38,7 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile index 9fcf449883..ee6bfb5ac5 100644 --- a/usr/src/lib/libmd/sparc/Makefile +++ b/usr/src/lib/libmd/sparc/Makefile @@ -45,7 +45,7 @@ pics/edonr.o := CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/lib/libmd/sparcv9/Makefile b/usr/src/lib/libmd/sparcv9/Makefile index 33ec27087f..828180e233 100644 --- a/usr/src/lib/libmd/sparcv9/Makefile +++ b/usr/src/lib/libmd/sparcv9/Makefile @@ -42,7 +42,7 @@ EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \ all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libmd5/amd64/Makefile b/usr/src/lib/libmd5/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/amd64/Makefile +++ b/usr/src/lib/libmd5/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/i386/Makefile b/usr/src/lib/libmd5/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libmd5/i386/Makefile +++ b/usr/src/lib/libmd5/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparc/Makefile b/usr/src/lib/libmd5/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libmd5/sparc/Makefile +++ b/usr/src/lib/libmd5/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmd5/sparcv9/Makefile b/usr/src/lib/libmd5/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libmd5/sparcv9/Makefile +++ b/usr/src/lib/libmd5/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libmp/Makefile.com b/usr/src/lib/libmp/Makefile.com index 2664c1fbdf..3c71277267 100644 --- a/usr/src/lib/libmp/Makefile.com +++ b/usr/src/lib/libmp/Makefile.com @@ -34,6 +34,9 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs +COMPATLINKS += usr/lib/libmp.so.1 +$(ROOT)/usr/lib/libmp.so.1 := COMPATLINKTARGET=../../lib/libmp.so.1 + SRCDIR = ../common OMAPFILE = ../common/mapfile_1-vers diff --git a/usr/src/lib/libmp/amd64/Makefile b/usr/src/lib/libmp/amd64/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/amd64/Makefile +++ b/usr/src/lib/libmp/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 @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile index ee90826c9b..c51c018c88 100644 --- a/usr/src/lib/libmp/i386/Makefile +++ b/usr/src/lib/libmp/i386/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile index 9c62a2b7ac..8bb9a77528 100644 --- a/usr/src/lib/libmp/sparc/Makefile +++ b/usr/src/lib/libmp/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # OLIBRARY = libmp.so.1 @@ -51,4 +51,5 @@ pics/pics_mp.o: all: $(LIBS) $(OLIBRARY) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libmp/sparcv9/Makefile b/usr/src/lib/libmp/sparcv9/Makefile index fc9ec9e40a..40902c4fa9 100644 --- a/usr/src/lib/libmp/sparcv9/Makefile +++ b/usr/src/lib/libmp/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 @@ -34,4 +34,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libmvec/amd64/Makefile b/usr/src/lib/libmvec/amd64/Makefile index c7f904a08c..3629bc7829 100644 --- a/usr/src/lib/libmvec/amd64/Makefile +++ b/usr/src/lib/libmvec/amd64/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = amd64 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include $(SRC)/lib/Makefile.lib.64 SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/i386/Makefile b/usr/src/lib/libmvec/i386/Makefile index f99f809c60..0fa671af18 100644 --- a/usr/src/lib/libmvec/i386/Makefile +++ b/usr/src/lib/libmvec/i386/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= i386 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -24,6 +24,6 @@ include ../Makefile.com SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libmvec/sparc/Makefile b/usr/src/lib/libmvec/sparc/Makefile index 39df5d8353..d0f5a55218 100644 --- a/usr/src/lib/libmvec/sparc/Makefile +++ b/usr/src/lib/libmvec/sparc/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH= sparc -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -25,6 +25,6 @@ include ../Makefile.com CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libmvec/sparcv9/Makefile b/usr/src/lib/libmvec/sparcv9/Makefile index e649b04b32..06f87dc853 100644 --- a/usr/src/lib/libmvec/sparcv9/Makefile +++ b/usr/src/lib/libmvec/sparcv9/Makefile @@ -15,8 +15,8 @@ TARGET_ARCH = sparcv9 -LIBRARY = libmvec.a -VERS = .1 +LIBRARY = libmvec.a +VERS = .1 OBJECTS = $(mvecOBJS) @@ -27,6 +27,6 @@ CHIP = ultra SRCS = $(SRCS_mvec) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/libm/Makefile.targ diff --git a/usr/src/lib/libnsl/amd64/Makefile b/usr/src/lib/libnsl/amd64/Makefile index ed0a7167be..88032f0441 100644 --- a/usr/src/lib/libnsl/amd64/Makefile +++ b/usr/src/lib/libnsl/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -35,4 +35,4 @@ include ../../Makefile.lib.64 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnsl/i386/Makefile b/usr/src/lib/libnsl/i386/Makefile index 8a08a082d5..655acde2a7 100644 --- a/usr/src/lib/libnsl/i386/Makefile +++ b/usr/src/lib/libnsl/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparc/Makefile b/usr/src/lib/libnsl/sparc/Makefile index 8a08a082d5..655acde2a7 100644 --- a/usr/src/lib/libnsl/sparc/Makefile +++ b/usr/src/lib/libnsl/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnsl/sparcv9/Makefile b/usr/src/lib/libnsl/sparcv9/Makefile index 249857bc50..d26d0a9514 100644 --- a/usr/src/lib/libnsl/sparcv9/Makefile +++ b/usr/src/lib/libnsl/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) diff --git a/usr/src/lib/libnvpair/amd64/Makefile b/usr/src/lib/libnvpair/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/amd64/Makefile +++ b/usr/src/lib/libnvpair/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libnvpair/i386/Makefile b/usr/src/lib/libnvpair/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libnvpair/i386/Makefile +++ b/usr/src/lib/libnvpair/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparc/Makefile b/usr/src/lib/libnvpair/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libnvpair/sparc/Makefile +++ b/usr/src/lib/libnvpair/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libnvpair/sparcv9/Makefile b/usr/src/lib/libnvpair/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/libnvpair/sparcv9/Makefile +++ b/usr/src/lib/libnvpair/sparcv9/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpam/amd64/Makefile b/usr/src/lib/libpam/amd64/Makefile index 8f7590c2ef..8f9bf5b7c3 100644 --- a/usr/src/lib/libpam/amd64/Makefile +++ b/usr/src/lib/libpam/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpam/i386/Makefile b/usr/src/lib/libpam/i386/Makefile index e129d9ceb8..16c9d09c13 100644 --- a/usr/src/lib/libpam/i386/Makefile +++ b/usr/src/lib/libpam/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparc/Makefile b/usr/src/lib/libpam/sparc/Makefile index bf37e5e370..00586b6ffb 100644 --- a/usr/src/lib/libpam/sparc/Makefile +++ b/usr/src/lib/libpam/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libpam/sparcv9/Makefile b/usr/src/lib/libpam/sparcv9/Makefile index 401952a7f8..8e700da449 100644 --- a/usr/src/lib/libpam/sparcv9/Makefile +++ b/usr/src/lib/libpam/sparcv9/Makefile @@ -25,9 +25,9 @@ # # lib/libpam/sparcv9/Makefile # -# 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/libproc/amd64/Makefile b/usr/src/lib/libproc/amd64/Makefile index 01b08012b0..2d6bf59aa3 100644 --- a/usr/src/lib/libproc/amd64/Makefile +++ b/usr/src/lib/libproc/amd64/Makefile @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 LDLIBS += -lsaveargs -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libproc/i386/Makefile b/usr/src/lib/libproc/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libproc/i386/Makefile +++ b/usr/src/lib/libproc/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparc/Makefile b/usr/src/lib/libproc/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libproc/sparc/Makefile +++ b/usr/src/lib/libproc/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libproc/sparcv9/Makefile b/usr/src/lib/libproc/sparcv9/Makefile index d80185b758..4e969f17a0 100644 --- a/usr/src/lib/libproc/sparcv9/Makefile +++ b/usr/src/lib/libproc/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 CPPFLAGS += -D_SYSCALL32 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libpthread/amd64/Makefile b/usr/src/lib/libpthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/amd64/Makefile +++ b/usr/src/lib/libpthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/i386/Makefile b/usr/src/lib/libpthread/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libpthread/i386/Makefile +++ b/usr/src/lib/libpthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparc/Makefile b/usr/src/lib/libpthread/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libpthread/sparc/Makefile +++ b/usr/src/lib/libpthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libpthread/sparcv9/Makefile b/usr/src/lib/libpthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libpthread/sparcv9/Makefile +++ b/usr/src/lib/libpthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librcm/amd64/Makefile b/usr/src/lib/librcm/amd64/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/amd64/Makefile +++ b/usr/src/lib/librcm/amd64/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librcm/i386/Makefile b/usr/src/lib/librcm/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/librcm/i386/Makefile +++ b/usr/src/lib/librcm/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparc/Makefile b/usr/src/lib/librcm/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/librcm/sparc/Makefile +++ b/usr/src/lib/librcm/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librcm/sparcv9/Makefile b/usr/src/lib/librcm/sparcv9/Makefile index cb39a2beff..ab72b4df45 100644 --- a/usr/src/lib/librcm/sparcv9/Makefile +++ b/usr/src/lib/librcm/sparcv9/Makefile @@ -23,10 +23,10 @@ # 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) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index 7f843a187d..d74c41ecfb 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -66,13 +66,15 @@ SMATCH=off ROOTDYNLIBS= $(DYNLIB:%=$(ROOTLIBDIR)/%) +COMPATLINKS= usr/lib/$(DYNLIB) + .KEEP_STATE: LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTDYNLIBS) +install: all $(ROOTDYNLIBS) $(ROOTCOMPATLINKS) # include library targets 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 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/i386/Makefile +++ b/usr/src/lib/libresolv2/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libresolv2/sparc/Makefile +++ b/usr/src/lib/libresolv2/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +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) diff --git a/usr/src/lib/librestart/amd64/Makefile b/usr/src/lib/librestart/amd64/Makefile index 72f3f2c326..bc2bb82a5e 100644 --- a/usr/src/lib/librestart/amd64/Makefile +++ b/usr/src/lib/librestart/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librestart/i386/Makefile b/usr/src/lib/librestart/i386/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/librestart/i386/Makefile +++ b/usr/src/lib/librestart/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparc/Makefile b/usr/src/lib/librestart/sparc/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/librestart/sparc/Makefile +++ b/usr/src/lib/librestart/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librestart/sparcv9/Makefile b/usr/src/lib/librestart/sparcv9/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/librestart/sparcv9/Makefile +++ b/usr/src/lib/librestart/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/amd64/Makefile b/usr/src/lib/librpcsvc/amd64/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/amd64/Makefile +++ b/usr/src/lib/librpcsvc/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 @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librpcsvc/i386/Makefile b/usr/src/lib/librpcsvc/i386/Makefile index 2fbc3ea93d..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/i386/Makefile +++ b/usr/src/lib/librpcsvc/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparc/Makefile b/usr/src/lib/librpcsvc/sparc/Makefile index 2fbc3ea93d..00998e3cfe 100644 --- a/usr/src/lib/librpcsvc/sparc/Makefile +++ b/usr/src/lib/librpcsvc/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/librpcsvc/sparcv9/Makefile b/usr/src/lib/librpcsvc/sparcv9/Makefile index 9ab764a959..a41aeec527 100644 --- a/usr/src/lib/librpcsvc/sparcv9/Makefile +++ b/usr/src/lib/librpcsvc/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 @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com index 9585165ab4..2472527a6e 100644 --- a/usr/src/lib/librt/Makefile.com +++ b/usr/src/lib/librt/Makefile.com @@ -28,3 +28,28 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs DYNFLAGS += -F libc.so.1 + +COMPATLINKS += lib/libposix4.so.1 \ + lib/libposix4.so \ + usr/lib/libposix4.so.1 \ + usr/lib/libposix4.so + +COMPATLINKS64 += lib/$(MACH64)/libposix4.so.1 \ + lib/$(MACH64)/libposix4.so \ + usr/lib/$(MACH64)/libposix4.so.1 \ + usr/lib/$(MACH64)/libposix4.so + +$(ROOT)/lib/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/libposix4.so.1 := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/usr/lib/libposix4.so := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 diff --git a/usr/src/lib/librt/amd64/Makefile b/usr/src/lib/librt/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/amd64/Makefile +++ b/usr/src/lib/librt/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/i386/Makefile b/usr/src/lib/librt/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/librt/i386/Makefile +++ b/usr/src/lib/librt/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparc/Makefile b/usr/src/lib/librt/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/librt/sparc/Makefile +++ b/usr/src/lib/librt/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparcv9/Makefile b/usr/src/lib/librt/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/sparcv9/Makefile +++ b/usr/src/lib/librt/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libscf/amd64/Makefile b/usr/src/lib/libscf/amd64/Makefile index 72f3f2c326..bc2bb82a5e 100644 --- a/usr/src/lib/libscf/amd64/Makefile +++ b/usr/src/lib/libscf/amd64/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libscf/i386/Makefile b/usr/src/lib/libscf/i386/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/libscf/i386/Makefile +++ b/usr/src/lib/libscf/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparc/Makefile b/usr/src/lib/libscf/sparc/Makefile index 5da8e64ac5..90bed38cc2 100644 --- a/usr/src/lib/libscf/sparc/Makefile +++ b/usr/src/lib/libscf/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libscf/sparcv9/Makefile b/usr/src/lib/libscf/sparcv9/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libscf/sparcv9/Makefile +++ b/usr/src/lib/libscf/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsec/amd64/Makefile b/usr/src/lib/libsec/amd64/Makefile index 58854901e8..fd6f777e6e 100644 --- a/usr/src/lib/libsec/amd64/Makefile +++ b/usr/src/lib/libsec/amd64/Makefile @@ -32,4 +32,4 @@ LIBS= $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsec/i386/Makefile b/usr/src/lib/libsec/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libsec/i386/Makefile +++ b/usr/src/lib/libsec/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparc/Makefile b/usr/src/lib/libsec/sparc/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libsec/sparc/Makefile +++ b/usr/src/lib/libsec/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsec/sparcv9/Makefile b/usr/src/lib/libsec/sparcv9/Makefile index 58854901e8..fd6f777e6e 100644 --- a/usr/src/lib/libsec/sparcv9/Makefile +++ b/usr/src/lib/libsec/sparcv9/Makefile @@ -32,4 +32,4 @@ LIBS= $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/amd64/Makefile b/usr/src/lib/libsecdb/amd64/Makefile index 67538ac8f1..297028a599 100644 --- a/usr/src/lib/libsecdb/amd64/Makefile +++ b/usr/src/lib/libsecdb/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # @@ -32,4 +32,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsecdb/i386/Makefile b/usr/src/lib/libsecdb/i386/Makefile index 46b260b17a..c8c3c5083d 100644 --- a/usr/src/lib/libsecdb/i386/Makefile +++ b/usr/src/lib/libsecdb/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparc/Makefile b/usr/src/lib/libsecdb/sparc/Makefile index 461a62cb22..5ab240f17d 100644 --- a/usr/src/lib/libsecdb/sparc/Makefile +++ b/usr/src/lib/libsecdb/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsecdb/sparcv9/Makefile b/usr/src/lib/libsecdb/sparcv9/Makefile index 7821a207c0..b8482c4e10 100644 --- a/usr/src/lib/libsecdb/sparcv9/Makefile +++ b/usr/src/lib/libsecdb/sparcv9/Makefile @@ -25,7 +25,7 @@ # # lib/libsecdb/sparcv9/Makefile # -#ident "%Z%%M% %I% %E% SMI" + # @@ -34,4 +34,4 @@ include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/amd64/Makefile b/usr/src/lib/libsendfile/amd64/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/amd64/Makefile +++ b/usr/src/lib/libsendfile/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" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsendfile/i386/Makefile b/usr/src/lib/libsendfile/i386/Makefile index 6d5993bff1..1e27013184 100644 --- a/usr/src/lib/libsendfile/i386/Makefile +++ b/usr/src/lib/libsendfile/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparc/Makefile b/usr/src/lib/libsendfile/sparc/Makefile index 6d5993bff1..1e27013184 100644 --- a/usr/src/lib/libsendfile/sparc/Makefile +++ b/usr/src/lib/libsendfile/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsendfile/sparcv9/Makefile b/usr/src/lib/libsendfile/sparcv9/Makefile index f69d11f706..cde9b4f678 100644 --- a/usr/src/lib/libsendfile/sparcv9/Makefile +++ b/usr/src/lib/libsendfile/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" + # MAPFILE32 = @@ -30,4 +30,4 @@ MAPFILE32 = include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsocket/amd64/Makefile b/usr/src/lib/libsocket/amd64/Makefile index 9fcd5cdbcb..b5ea3b52d1 100644 --- a/usr/src/lib/libsocket/amd64/Makefile +++ b/usr/src/lib/libsocket/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -30,4 +30,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsocket/i386/Makefile b/usr/src/lib/libsocket/i386/Makefile index 67e3d625c3..8d2e4a0b95 100644 --- a/usr/src/lib/libsocket/i386/Makefile +++ b/usr/src/lib/libsocket/i386/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparc/Makefile b/usr/src/lib/libsocket/sparc/Makefile index 6cbbf06d61..e82960834b 100644 --- a/usr/src/lib/libsocket/sparc/Makefile +++ b/usr/src/lib/libsocket/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsocket/sparcv9/Makefile b/usr/src/lib/libsocket/sparcv9/Makefile index 2eafde412a..1d6a481946 100644 --- a/usr/src/lib/libsocket/sparcv9/Makefile +++ b/usr/src/lib/libsocket/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsysevent/amd64/Makefile b/usr/src/lib/libsysevent/amd64/Makefile index f3d6516cc0..e9d461671f 100644 --- a/usr/src/lib/libsysevent/amd64/Makefile +++ b/usr/src/lib/libsysevent/amd64/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libsysevent/i386/Makefile b/usr/src/lib/libsysevent/i386/Makefile index e27ec93133..2bfb89d072 100644 --- a/usr/src/lib/libsysevent/i386/Makefile +++ b/usr/src/lib/libsysevent/i386/Makefile @@ -30,4 +30,4 @@ all: $(LIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparc/Makefile b/usr/src/lib/libsysevent/sparc/Makefile index c36d129a1d..424b46abc8 100644 --- a/usr/src/lib/libsysevent/sparc/Makefile +++ b/usr/src/lib/libsysevent/sparc/Makefile @@ -30,4 +30,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libsysevent/sparcv9/Makefile b/usr/src/lib/libsysevent/sparcv9/Makefile index 631a31bc85..9b50cbc3f6 100644 --- a/usr/src/lib/libsysevent/sparcv9/Makefile +++ b/usr/src/lib/libsysevent/sparcv9/Makefile @@ -31,4 +31,4 @@ include ../../Makefile.lib.64 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtermcap/Makefile.com b/usr/src/lib/libtermcap/Makefile.com index 79446bea02..1a1efeee30 100644 --- a/usr/src/lib/libtermcap/Makefile.com +++ b/usr/src/lib/libtermcap/Makefile.com @@ -13,10 +13,18 @@ # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # +LIBRARY = libtermcap.a +VERS = .1 + # install this library in the root filesystem include ../../Makefile.rootfs -LIBRARY = libtermcap.a -VERS = .1 +COMPATLINKS += usr/ccs/lib/libtermcap.so +COMPATLINKS64 += usr/ccs/lib/$(MACH64)/libtermcap.so + +$(ROOT)/usr/ccs/lib/libtermcap.so := \ + COMPATLINKTARGET=../../../lib/libtermcap.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so := \ + COMPATLINKTARGET=../../../../lib/$(MACH64)/libtermcap.so.1 DYNFLAGS += $(ZLOADFLTR) diff --git a/usr/src/lib/libtermcap/amd64/Makefile b/usr/src/lib/libtermcap/amd64/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/amd64/Makefile +++ b/usr/src/lib/libtermcap/amd64/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/i386/Makefile b/usr/src/lib/libtermcap/i386/Makefile index e868f38c09..552b51a68f 100644 --- a/usr/src/lib/libtermcap/i386/Makefile +++ b/usr/src/lib/libtermcap/i386/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparc/Makefile b/usr/src/lib/libtermcap/sparc/Makefile index e868f38c09..552b51a68f 100644 --- a/usr/src/lib/libtermcap/sparc/Makefile +++ b/usr/src/lib/libtermcap/sparc/Makefile @@ -16,6 +16,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: $(ROOTLIBS) $(ROOTLINKS) +install: $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtermcap/sparcv9/Makefile b/usr/src/lib/libtermcap/sparcv9/Makefile index 3e04fa59f3..8ca5b38196 100644 --- a/usr/src/lib/libtermcap/sparcv9/Makefile +++ b/usr/src/lib/libtermcap/sparcv9/Makefile @@ -14,9 +14,9 @@ # include $(SRC)/lib/Makefile.filter.com -include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 +include ../Makefile.com -install: $(ROOTLIBS64) $(ROOTLINKS64) +install: $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/Makefile.com b/usr/src/lib/libthread/Makefile.com index 8de39ee8e5..f74b429257 100644 --- a/usr/src/lib/libthread/Makefile.com +++ b/usr/src/lib/libthread/Makefile.com @@ -28,3 +28,34 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs DYNFLAGS += -F libc.so.1 + +COMPATLINKS += usr/lib/lwp/libthread.so.1 \ + usr/lib/lwp/libthread_db.so.1 \ + lib/libthread_db.so.1 \ + lib/libthread_db.so \ + usr/lib/libthread_db.so.1 \ + usr/lib/libthread_db.so + +COMPATLINKS64 += usr/lib/lwp/$(MACH64)/libthread.so.1 \ + usr/lib/lwp/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so.1 \ + lib/$(MACH64)/libthread_db.so \ + usr/lib/$(MACH64)/libthread_db.so.1 \ + usr/lib/$(MACH64)/libthread_db.so + +$(ROOT)/usr/lib/lwp/libthread.so.1 := COMPATLINKTARGET=../libthread.so.1 +$(ROOT)/usr/lib/lwp/libthread_db.so.1 := COMPATLINKTARGET=../libthread_db.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread.so.1 +$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../$(MACH64)/libthread_db.so.1 +$(ROOT)/lib/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so.1 := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/usr/lib/libthread_db.so := COMPATLINKTARGET=../../lib/libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/lib/$(MACH64)/libthread_db.so := COMPATLINKTARGET=libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 +$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1 diff --git a/usr/src/lib/libthread/amd64/Makefile b/usr/src/lib/libthread/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/amd64/Makefile +++ b/usr/src/lib/libthread/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/i386/Makefile b/usr/src/lib/libthread/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libthread/i386/Makefile +++ b/usr/src/lib/libthread/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparc/Makefile b/usr/src/lib/libthread/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libthread/sparc/Makefile +++ b/usr/src/lib/libthread/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libthread/sparcv9/Makefile b/usr/src/lib/libthread/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libthread/sparcv9/Makefile +++ b/usr/src/lib/libthread/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libtsnet/amd64/Makefile b/usr/src/lib/libtsnet/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsnet/amd64/Makefile +++ b/usr/src/lib/libtsnet/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsnet/i386/Makefile b/usr/src/lib/libtsnet/i386/Makefile index d6eed917a9..8537c30eda 100644 --- a/usr/src/lib/libtsnet/i386/Makefile +++ b/usr/src/lib/libtsnet/i386/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparc/Makefile b/usr/src/lib/libtsnet/sparc/Makefile index a8078739af..1551cf2cb2 100644 --- a/usr/src/lib/libtsnet/sparc/Makefile +++ b/usr/src/lib/libtsnet/sparc/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsnet/sparcv9/Makefile b/usr/src/lib/libtsnet/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsnet/sparcv9/Makefile +++ b/usr/src/lib/libtsnet/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/amd64/Makefile b/usr/src/lib/libtsol/amd64/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsol/amd64/Makefile +++ b/usr/src/lib/libtsol/amd64/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libtsol/i386/Makefile b/usr/src/lib/libtsol/i386/Makefile index 282da97a76..0a45e8bf8d 100644 --- a/usr/src/lib/libtsol/i386/Makefile +++ b/usr/src/lib/libtsol/i386/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparc/Makefile b/usr/src/lib/libtsol/sparc/Makefile index 282da97a76..cf2087e71e 100644 --- a/usr/src/lib/libtsol/sparc/Makefile +++ b/usr/src/lib/libtsol/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libtsol/sparcv9/Makefile b/usr/src/lib/libtsol/sparcv9/Makefile index b13b247ca8..a48c536235 100644 --- a/usr/src/lib/libtsol/sparcv9/Makefile +++ b/usr/src/lib/libtsol/sparcv9/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com index 504a8beb38..21ddb07c76 100644 --- a/usr/src/lib/libumem/Makefile.com +++ b/usr/src/lib/libumem/Makefile.com @@ -159,7 +159,7 @@ CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) pics/umem.o := SMOFF += index_overflow objs/umem.o := SMOFF += index_overflow -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) $(ROOTCOMPATLINKS) DYNFLAGS += $(ZINTERPOSE) diff --git a/usr/src/lib/libumem/amd64/Makefile b/usr/src/lib/libumem/amd64/Makefile index 9c3b6bd6a7..66257765d3 100644 --- a/usr/src/lib/libumem/amd64/Makefile +++ b/usr/src/lib/libumem/amd64/Makefile @@ -31,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libumem/sparcv9/Makefile b/usr/src/lib/libumem/sparcv9/Makefile index 763d425cc0..27258f0fc7 100644 --- a/usr/src/lib/libumem/sparcv9/Makefile +++ b/usr/src/lib/libumem/sparcv9/Makefile @@ -31,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libuuid/amd64/Makefile b/usr/src/lib/libuuid/amd64/Makefile index 30d4207380..f820b35e24 100644 --- a/usr/src/lib/libuuid/amd64/Makefile +++ b/usr/src/lib/libuuid/amd64/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuuid/i386/Makefile b/usr/src/lib/libuuid/i386/Makefile index 300d26fee1..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/i386/Makefile +++ b/usr/src/lib/libuuid/i386/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparc/Makefile b/usr/src/lib/libuuid/sparc/Makefile index 300d26fee1..9fc7468c2a 100644 --- a/usr/src/lib/libuuid/sparc/Makefile +++ b/usr/src/lib/libuuid/sparc/Makefile @@ -28,4 +28,4 @@ include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuuid/sparcv9/Makefile b/usr/src/lib/libuuid/sparcv9/Makefile index cfbc2a8822..aa340f7eee 100644 --- a/usr/src/lib/libuuid/sparcv9/Makefile +++ b/usr/src/lib/libuuid/sparcv9/Makefile @@ -31,4 +31,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/amd64/Makefile b/usr/src/lib/libuutil/amd64/Makefile index 010d484a50..2bbd813164 100644 --- a/usr/src/lib/libuutil/amd64/Makefile +++ b/usr/src/lib/libuutil/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libuutil/i386/Makefile b/usr/src/lib/libuutil/i386/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libuutil/i386/Makefile +++ b/usr/src/lib/libuutil/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparc/Makefile b/usr/src/lib/libuutil/sparc/Makefile index 18584b4da1..59045395eb 100644 --- a/usr/src/lib/libuutil/sparc/Makefile +++ b/usr/src/lib/libuutil/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libuutil/sparcv9/Makefile b/usr/src/lib/libuutil/sparcv9/Makefile index 351c978643..7270774630 100644 --- a/usr/src/lib/libuutil/sparcv9/Makefile +++ b/usr/src/lib/libuutil/sparcv9/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB) all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libw/amd64/Makefile b/usr/src/lib/libw/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/amd64/Makefile +++ b/usr/src/lib/libw/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/i386/Makefile b/usr/src/lib/libw/i386/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/i386/Makefile +++ b/usr/src/lib/libw/i386/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparc/Makefile b/usr/src/lib/libw/sparc/Makefile index c318e6089b..2c781f2d6c 100644 --- a/usr/src/lib/libw/sparc/Makefile +++ b/usr/src/lib/libw/sparc/Makefile @@ -26,6 +26,6 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libw/sparcv9/Makefile b/usr/src/lib/libw/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libw/sparcv9/Makefile +++ b/usr/src/lib/libw/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/amd64/Makefile b/usr/src/lib/libxnet/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/amd64/Makefile +++ b/usr/src/lib/libxnet/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/i386/Makefile b/usr/src/lib/libxnet/i386/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libxnet/i386/Makefile +++ b/usr/src/lib/libxnet/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparc/Makefile b/usr/src/lib/libxnet/sparc/Makefile index c318e6089b..682e5560ca 100644 --- a/usr/src/lib/libxnet/sparc/Makefile +++ b/usr/src/lib/libxnet/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libxnet/sparcv9/Makefile b/usr/src/lib/libxnet/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/libxnet/sparcv9/Makefile +++ b/usr/src/lib/libxnet/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/libzfs/amd64/Makefile b/usr/src/lib/libzfs/amd64/Makefile index 44075ed1bd..071ae5b23d 100644 --- a/usr/src/lib/libzfs/amd64/Makefile +++ b/usr/src/lib/libzfs/amd64/Makefile @@ -23,9 +23,9 @@ # Copyright 2005 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/libzfs/i386/Makefile b/usr/src/lib/libzfs/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs/i386/Makefile +++ b/usr/src/lib/libzfs/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparc/Makefile b/usr/src/lib/libzfs/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs/sparc/Makefile +++ b/usr/src/lib/libzfs/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs/sparcv9/Makefile b/usr/src/lib/libzfs/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs/sparcv9/Makefile +++ b/usr/src/lib/libzfs/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/amd64/Makefile b/usr/src/lib/libzfs_core/amd64/Makefile index b780a6dba8..14bdb8486d 100644 --- a/usr/src/lib/libzfs_core/amd64/Makefile +++ b/usr/src/lib/libzfs_core/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/i386/Makefile b/usr/src/lib/libzfs_core/i386/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/i386/Makefile +++ b/usr/src/lib/libzfs_core/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparc/Makefile b/usr/src/lib/libzfs_core/sparc/Makefile index 703879a954..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/sparc/Makefile +++ b/usr/src/lib/libzfs_core/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparcv9/Makefile b/usr/src/lib/libzfs_core/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs_core/sparcv9/Makefile +++ b/usr/src/lib/libzfs_core/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzutil/amd64/Makefile b/usr/src/lib/libzutil/amd64/Makefile index 5a2ea08b45..431f2454cb 100644 --- a/usr/src/lib/libzutil/amd64/Makefile +++ b/usr/src/lib/libzutil/amd64/Makefile @@ -16,4 +16,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzutil/i386/Makefile b/usr/src/lib/libzutil/i386/Makefile index aeec694b08..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/i386/Makefile +++ b/usr/src/lib/libzutil/i386/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparc/Makefile b/usr/src/lib/libzutil/sparc/Makefile index aeec694b08..c65cbc4e4a 100644 --- a/usr/src/lib/libzutil/sparc/Makefile +++ b/usr/src/lib/libzutil/sparc/Makefile @@ -15,4 +15,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzutil/sparcv9/Makefile b/usr/src/lib/libzutil/sparcv9/Makefile index e2931cd005..83072d9069 100644 --- a/usr/src/lib/libzutil/sparcv9/Makefile +++ b/usr/src/lib/libzutil/sparcv9/Makefile @@ -18,4 +18,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/compat/Makefile.com b/usr/src/lib/nsswitch/compat/Makefile.com index 5b600c5588..b5b4b7f388 100644 --- a/usr/src/lib/nsswitch/compat/Makefile.com +++ b/usr/src/lib/nsswitch/compat/Makefile.com @@ -23,9 +23,6 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/compat/Makefile.com LIBRARY = libnss_compat.a VERS = .1 @@ -43,5 +40,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -LDLIBS += -lnsl DYNLIB1 = nss_compat.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +LDLIBS += -lnsl + diff --git a/usr/src/lib/nsswitch/compat/amd64/Makefile b/usr/src/lib/nsswitch/compat/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/compat/amd64/Makefile +++ b/usr/src/lib/nsswitch/compat/amd64/Makefile @@ -23,7 +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 @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/compat/i386/Makefile b/usr/src/lib/nsswitch/compat/i386/Makefile index b7894e1fb1..2ca94e0c37 100644 --- a/usr/src/lib/nsswitch/compat/i386/Makefile +++ b/usr/src/lib/nsswitch/compat/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparc/Makefile b/usr/src/lib/nsswitch/compat/sparc/Makefile index bf84dac75a..9b36f0b9be 100644 --- a/usr/src/lib/nsswitch/compat/sparc/Makefile +++ b/usr/src/lib/nsswitch/compat/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/compat/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/compat/sparcv9/Makefile b/usr/src/lib/nsswitch/compat/sparcv9/Makefile index 7e6c72e5c7..39d99524aa 100644 --- a/usr/src/lib/nsswitch/compat/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/compat/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/Makefile.com b/usr/src/lib/nsswitch/dns/Makefile.com index 0c17e48cb0..e1a02743d1 100644 --- a/usr/src/lib/nsswitch/dns/Makefile.com +++ b/usr/src/lib/nsswitch/dns/Makefile.com @@ -38,10 +38,19 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs +DYNLIB1 = nss_dns.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + # Appropriate libresolv loaded at runtime. This is the default, to be dlopened # if no libresolv was provided by the application. CPPFLAGS += -DNSS_DNS_LIBRESOLV=\"libresolv.so.2\" LDLIBS += -lnsl -lsocket -DYNLIB1 = nss_dns.so$(VERS) + diff --git a/usr/src/lib/nsswitch/dns/amd64/Makefile b/usr/src/lib/nsswitch/dns/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/dns/amd64/Makefile +++ b/usr/src/lib/nsswitch/dns/amd64/Makefile @@ -23,7 +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 @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/dns/i386/Makefile b/usr/src/lib/nsswitch/dns/i386/Makefile index 164288fc1d..a1784e474a 100644 --- a/usr/src/lib/nsswitch/dns/i386/Makefile +++ b/usr/src/lib/nsswitch/dns/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparc/Makefile b/usr/src/lib/nsswitch/dns/sparc/Makefile index 9ea99483e7..c42e6a88f5 100644 --- a/usr/src/lib/nsswitch/dns/sparc/Makefile +++ b/usr/src/lib/nsswitch/dns/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/dns/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/dns/sparcv9/Makefile b/usr/src/lib/nsswitch/dns/sparcv9/Makefile index dbcedcf28e..b686e818ca 100644 --- a/usr/src/lib/nsswitch/dns/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/dns/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index e9d189e759..e79567aaaf 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -60,4 +60,18 @@ CPPFLAGS += -I../../../common/inc LDLIBS += -lnsl DYNLIB1 = nss_files.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) \ + etc/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1) + all: $(DYNLIB1) + diff --git a/usr/src/lib/nsswitch/files/amd64/Makefile b/usr/src/lib/nsswitch/files/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/files/amd64/Makefile +++ b/usr/src/lib/nsswitch/files/amd64/Makefile @@ -23,7 +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 @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/files/i386/Makefile b/usr/src/lib/nsswitch/files/i386/Makefile index 96e5ad1958..8680ea468e 100644 --- a/usr/src/lib/nsswitch/files/i386/Makefile +++ b/usr/src/lib/nsswitch/files/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparc/Makefile b/usr/src/lib/nsswitch/files/sparc/Makefile index e79a5949bb..13c233f678 100644 --- a/usr/src/lib/nsswitch/files/sparc/Makefile +++ b/usr/src/lib/nsswitch/files/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/files/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/files/sparcv9/Makefile b/usr/src/lib/nsswitch/files/sparcv9/Makefile index 1c6d8cc170..1509fc0993 100644 --- a/usr/src/lib/nsswitch/files/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/files/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/nis/Makefile.com b/usr/src/lib/nsswitch/nis/Makefile.com index bee295ee5c..0e083e1c0e 100644 --- a/usr/src/lib/nsswitch/nis/Makefile.com +++ b/usr/src/lib/nsswitch/nis/Makefile.com @@ -54,6 +54,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs +DYNLIB1 = nss_nis.so$(VERS) + +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) LDLIBS += -lnsl -DYNLIB1 = nss_nis.so$(VERS) + diff --git a/usr/src/lib/nsswitch/nis/amd64/Makefile b/usr/src/lib/nsswitch/nis/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/nis/amd64/Makefile +++ b/usr/src/lib/nsswitch/nis/amd64/Makefile @@ -23,7 +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 @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/nis/i386/Makefile b/usr/src/lib/nsswitch/nis/i386/Makefile index 7c905cb9ed..efacc329ce 100644 --- a/usr/src/lib/nsswitch/nis/i386/Makefile +++ b/usr/src/lib/nsswitch/nis/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/i386/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparc/Makefile b/usr/src/lib/nsswitch/nis/sparc/Makefile index cc816ee636..8ffaa154cd 100644 --- a/usr/src/lib/nsswitch/nis/sparc/Makefile +++ b/usr/src/lib/nsswitch/nis/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # lib/nsswitch/nis/sparc/Makefile @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/nis/sparcv9/Makefile b/usr/src/lib/nsswitch/nis/sparcv9/Makefile index 66974953c6..02a0757556 100644 --- a/usr/src/lib/nsswitch/nis/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/nis/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com index 691d13d376..0a1803ff22 100644 --- a/usr/src/lib/nsswitch/user/Makefile.com +++ b/usr/src/lib/nsswitch/user/Makefile.com @@ -35,8 +35,15 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -CPPFLAGS += -I../../../common/inc - DYNLIB1 = nss_user.so$(VERS) +COMPATLINKS= usr/lib/$(DYNLIB1) +COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1) + +$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1) +$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1) := \ + COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1) + +CPPFLAGS += -I../../../common/inc + all: $(DYNLIB1) diff --git a/usr/src/lib/nsswitch/user/amd64/Makefile b/usr/src/lib/nsswitch/user/amd64/Makefile index 1334471b25..2f85b65f33 100644 --- a/usr/src/lib/nsswitch/user/amd64/Makefile +++ b/usr/src/lib/nsswitch/user/amd64/Makefile @@ -23,7 +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 @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/nsswitch/user/i386/Makefile b/usr/src/lib/nsswitch/user/i386/Makefile index 173380a346..ffe5bd84ba 100644 --- a/usr/src/lib/nsswitch/user/i386/Makefile +++ b/usr/src/lib/nsswitch/user/i386/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparc/Makefile b/usr/src/lib/nsswitch/user/sparc/Makefile index 2d974133a9..6de0a45157 100644 --- a/usr/src/lib/nsswitch/user/sparc/Makefile +++ b/usr/src/lib/nsswitch/user/sparc/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -33,4 +33,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOTLIBS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/nsswitch/user/sparcv9/Makefile b/usr/src/lib/nsswitch/user/sparcv9/Makefile index 87fbebb765..7f1a6c94bf 100644 --- a/usr/src/lib/nsswitch/user/sparcv9/Makefile +++ b/usr/src/lib/nsswitch/user/sparcv9/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" + # # Copyright (c) 1993,2001 by Sun Microsystems, Inc. # All rights reserved. @@ -34,4 +34,4 @@ LIBS = $(DYNLIB1) include ../../Makefile.targ -install: all $(ROOT64DYNLIB) +install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/print/libhttp-core/Makefile.com b/usr/src/lib/print/libhttp-core/Makefile.com index 45b5c6fd9a..2a0e82e1b9 100644 --- a/usr/src/lib/print/libhttp-core/Makefile.com +++ b/usr/src/lib/print/libhttp-core/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = http-addr.o http-support.o http.o ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libipp-core/Makefile.com b/usr/src/lib/print/libipp-core/Makefile.com index 6e7599193a..d6134f1481 100644 --- a/usr/src/lib/print/libipp-core/Makefile.com +++ b/usr/src/lib/print/libipp-core/Makefile.com @@ -29,12 +29,9 @@ VERS = .0 OBJECTS = ipp.o ipp_types.o read.o strings.o write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com index 52baf5f495..aed0d8e745 100644 --- a/usr/src/lib/print/libipp-listener/Makefile.com +++ b/usr/src/lib/print/libipp-listener/Makefile.com @@ -36,12 +36,9 @@ OBJECTS = \ set-printer-attributes.o validate-job.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libpapi-common/Makefile.com b/usr/src/lib/print/libpapi-common/Makefile.com index 1af239bded..0a1f4f213a 100644 --- a/usr/src/lib/print/libpapi-common/Makefile.com +++ b/usr/src/lib/print/libpapi-common/Makefile.com @@ -29,9 +29,6 @@ VERS = .0 OBJECTS = attribute.o common.o library.o list.o misc.o status.o uri.o include ../../../Makefile.lib -include ../../../Makefile.rootfs - -ROOTLIBDIR= $(ROOT)/usr/lib SRCDIR = ../common diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile.com b/usr/src/lib/print/libpapi-dynamic/Makefile.com index 2b5bb5c0f2..de7378e876 100644 --- a/usr/src/lib/print/libpapi-dynamic/Makefile.com +++ b/usr/src/lib/print/libpapi-dynamic/Makefile.com @@ -29,12 +29,9 @@ VERS = .0 OBJECTS = job.o nss.o printer.o psm.o service.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com index 4c08a5c3da..ef6b9110a3 100644 --- a/usr/src/lib/print/libpapi-ipp/Makefile.com +++ b/usr/src/lib/print/libpapi-ipp/Makefile.com @@ -27,10 +27,8 @@ LIBRARY = psm-ipp.a VERS = .1 OBJECTS = ipp-support.o job.o printer.o service.o -ROOTLIBDIR = $(ROOT)/usr/lib/print include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com index 8778603750..3de91a340b 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile.com +++ b/usr/src/lib/print/libpapi-lpd/Makefile.com @@ -31,7 +31,6 @@ OBJECTS = job.o library.o lpd-cancel.o lpd-job.o lpd-query.o printer.o \ service.o $(COMMON_OBJS) include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common diff --git a/usr/src/lib/print/libprint/Makefile.com b/usr/src/lib/print/libprint/Makefile.com index 661db1bbb4..6a79beed68 100644 --- a/usr/src/lib/print/libprint/Makefile.com +++ b/usr/src/lib/print/libprint/Makefile.com @@ -31,12 +31,9 @@ OBJECTS = \ ns_cmn_printer.o nss_convert.o nss_ldap.o nss_printer.o nss_write.o include ../../../Makefile.lib -include ../../../Makefile.rootfs SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib - LIBS = $(DYNLIB) diff --git a/usr/src/lib/storage/libg_fc/sparcv9/Makefile b/usr/src/lib/storage/libg_fc/sparcv9/Makefile index b86d3f1aa6..f20c879508 100644 --- a/usr/src/lib/storage/libg_fc/sparcv9/Makefile +++ b/usr/src/lib/storage/libg_fc/sparcv9/Makefile @@ -27,6 +27,6 @@ include ../../../Makefile.lib.64 .KEEP_STATE: -all: $(LIBS) +all: $(LIBS) install: all $(ROOTLIBS64) $(ROOTLINKS64) |