diff options
Diffstat (limited to 'usr/src/lib/nsswitch')
37 files changed, 100 insertions, 106 deletions
diff --git a/usr/src/lib/nsswitch/Makefile b/usr/src/lib/nsswitch/Makefile index c51fc6e5f4..2d238e24b1 100644 --- a/usr/src/lib/nsswitch/Makefile +++ b/usr/src/lib/nsswitch/Makefile @@ -33,11 +33,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) $(SUBDIRS): FRC @cd $@; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/Makefile.com b/usr/src/lib/nsswitch/Makefile.com index f10f086315..b574bb5563 100644 --- a/usr/src/lib/nsswitch/Makefile.com +++ b/usr/src/lib/nsswitch/Makefile.com @@ -31,8 +31,6 @@ SRCDIR = ../common ROOT32DYNLIB = $(ROOTLIBDIR)/$(DYNLIB1) ROOT64DYNLIB = $(ROOTLIBDIR64)/$(DYNLIB1) -LINTFLAGS = -ux -LINTOUT = lint.out CPPFLAGS += -D_REENTRANT @@ -48,7 +46,6 @@ SMATCH=off LDLIBS += -lc HSONAME = -CLEANFILES += $(LINTOUT) CLOBBERFILES += $(DYNLIB1) # Leaf target makefiles establish exactly what they will build by assigning to diff --git a/usr/src/lib/nsswitch/Makefile.targ b/usr/src/lib/nsswitch/Makefile.targ index 399d9be82c..a1870b74bc 100644 --- a/usr/src/lib/nsswitch/Makefile.targ +++ b/usr/src/lib/nsswitch/Makefile.targ @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# all: $(LIBS) @@ -47,8 +45,6 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -lint: - $(LINT.c) $(SRCS) $(LDLIBS) > $(LINTOUT) 2>&1 # Leaf target makefiles establish exactly what they will install. Use of # ROOTLIBS will install both the default archive library and DYNLIB1, diff --git a/usr/src/lib/nsswitch/ad/Makefile b/usr/src/lib/nsswitch/ad/Makefile index 284c347307..d5436150a4 100644 --- a/usr/src/lib/nsswitch/ad/Makefile +++ b/usr/src/lib/nsswitch/ad/Makefile @@ -34,11 +34,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/compat/Makefile b/usr/src/lib/nsswitch/compat/Makefile index 7e2c8196b1..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/compat/Makefile +++ b/usr/src/lib/nsswitch/compat/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/compat/Makefile include ../../../Makefile.master @@ -35,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) 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 b/usr/src/lib/nsswitch/dns/Makefile index 9fc3326ce3..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/dns/Makefile +++ b/usr/src/lib/nsswitch/dns/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/dns/Makefile include ../../../Makefile.master @@ -35,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/dns/Makefile.com b/usr/src/lib/nsswitch/dns/Makefile.com index 0366633c0c..bc66038274 100644 --- a/usr/src/lib/nsswitch/dns/Makefile.com +++ b/usr/src/lib/nsswitch/dns/Makefile.com @@ -38,11 +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\" -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 LDLIBS += -lnsl -lresolv_joy -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 b/usr/src/lib/nsswitch/files/Makefile index fdd66fff3b..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/files/Makefile +++ b/usr/src/lib/nsswitch/files/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/Makefile include ../../../Makefile.master @@ -35,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index 1489badee6..e79567aaaf 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -56,10 +56,22 @@ include ../../Makefile.com include ../../../Makefile.rootfs CPPFLAGS += -I../../../common/inc -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 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/ldap/Makefile b/usr/src/lib/nsswitch/ldap/Makefile index eabc270b02..676b76d129 100644 --- a/usr/src/lib/nsswitch/ldap/Makefile +++ b/usr/src/lib/nsswitch/ldap/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1999 by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/ldap/Makefile -# include ../../../Makefile.master @@ -36,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/ldap/Makefile.com b/usr/src/lib/nsswitch/ldap/Makefile.com index 694bd5f023..63dbda12ce 100644 --- a/usr/src/lib/nsswitch/ldap/Makefile.com +++ b/usr/src/lib/nsswitch/ldap/Makefile.com @@ -57,6 +57,4 @@ include ../../Makefile.com CPPFLAGS += -I../../../libsldap/common LDLIBS += -lsldap -lnsl -lldap -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 DYNLIB1 = nss_ldap.so$(VERS) diff --git a/usr/src/lib/nsswitch/mdns/Makefile b/usr/src/lib/nsswitch/mdns/Makefile index f67704e53a..842cd86b55 100644 --- a/usr/src/lib/nsswitch/mdns/Makefile +++ b/usr/src/lib/nsswitch/mdns/Makefile @@ -21,9 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/mdns/Makefile include ../../../Makefile.master @@ -33,11 +30,10 @@ all:= TARGET= all clean:= TARGET= clean clobber:= TARGET= clobber install:= TARGET= install -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint debugmod: $(FILES_SUBDIRS) +all clean clobber install debugmod: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/nis/Makefile b/usr/src/lib/nsswitch/nis/Makefile index b3dbfb5bf9..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/nis/Makefile +++ b/usr/src/lib/nsswitch/nis/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/nis/Makefile include ../../../Makefile.master @@ -35,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/nis/Makefile.com b/usr/src/lib/nsswitch/nis/Makefile.com index cbccdfb764..0e083e1c0e 100644 --- a/usr/src/lib/nsswitch/nis/Makefile.com +++ b/usr/src/lib/nsswitch/nis/Makefile.com @@ -54,8 +54,14 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 +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 b/usr/src/lib/nsswitch/user/Makefile index 123b24895e..ed69fbf8dd 100644 --- a/usr/src/lib/nsswitch/user/Makefile +++ b/usr/src/lib/nsswitch/user/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1991 - 1996, by Sun Microsystems, Inc. # All rights reserved. # -# lib/nsswitch/user/Makefile include ../../../Makefile.master @@ -35,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: $(FILES_SUBDIRS) +all clean clobber install: $(FILES_SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/nsswitch/user/Makefile.com b/usr/src/lib/nsswitch/user/Makefile.com index befd4172a7..0a1803ff22 100644 --- a/usr/src/lib/nsswitch/user/Makefile.com +++ b/usr/src/lib/nsswitch/user/Makefile.com @@ -22,9 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/nsswitch/user/Makefile.com LIBRARY = libnss_user.a VERS = .1 @@ -38,10 +35,15 @@ include ../../Makefile.com # install this library in the root filesystem include ../../../Makefile.rootfs -CPPFLAGS += -I../../../common/inc -LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED -LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED - 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) |