diff options
Diffstat (limited to 'usr/src/lib/libcrypt')
| -rw-r--r-- | usr/src/lib/libcrypt/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/Makefile.com | 41 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/amd64/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/i386/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/sparc/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libcrypt/sparcv9/Makefile | 5 |
6 files changed, 23 insertions, 41 deletions
diff --git a/usr/src/lib/libcrypt/Makefile b/usr/src/lib/libcrypt/Makefile index 7e799cd36f..5479015393 100644 --- a/usr/src/lib/libcrypt/Makefile +++ b/usr/src/lib/libcrypt/Makefile @@ -32,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) check: $(CHECKHDRS) diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com index a7f7632667..eb4db4b311 100644 --- a/usr/src/lib/libcrypt/Makefile.com +++ b/usr/src/lib/libcrypt/Makefile.com @@ -38,9 +38,7 @@ include ../../Makefile.lib SRCDIR= ../common -LIBS= $(DYNLIB) $(LINTLIB) - -$(LINTLIB):= SRCS=$(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -I../inc -I../../common/inc -I../../libgen/inc @@ -53,28 +51,25 @@ CERRWARN += $(CNOWARN_UNINIT) all: $(LIBS) -lint: lintcheck -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 bd2cdcd780..410bdb818e 100644 --- a/usr/src/lib/libcrypt/amd64/Makefile +++ b/usr/src/lib/libcrypt/amd64/Makefile @@ -23,13 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/amd64/Makefile include ../Makefile.com include ../../Makefile.lib.64 .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libcrypt/i386/Makefile b/usr/src/lib/libcrypt/i386/Makefile index d4def41822..dc6deda296 100644 --- a/usr/src/lib/libcrypt/i386/Makefile +++ b/usr/src/lib/libcrypt/i386/Makefile @@ -23,10 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libcrypt/ie86/Makefile include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libcrypt/sparc/Makefile b/usr/src/lib/libcrypt/sparc/Makefile index bcba4a291d..dc6deda296 100644 --- a/usr/src/lib/libcrypt/sparc/Makefile +++ b/usr/src/lib/libcrypt/sparc/Makefile @@ -23,10 +23,7 @@ # 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 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +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) |