diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-05 11:32:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-05 11:32:50 +0000 |
| commit | e28caa620b96c1b08f8b4ca6a99cb350839dfd02 (patch) | |
| tree | 5f0fde1b66a4900f5f8f141b710bc850f092d9be /usr/src/lib/fm | |
| parent | a59b194a7b40a08dc3d3ffe01f7781acd43ae60f (diff) | |
| parent | 3052595ab8ddcc51231d239415b5eba5d913d45b (diff) | |
| download | illumos-joyent-e28caa620b96c1b08f8b4ca6a99cb350839dfd02.tar.gz | |
[illumos-gate merge]
commit 3052595ab8ddcc51231d239415b5eba5d913d45b
11807 "private use area" characters should be marked as "printable"
commit cd61ae21816e53b94bc1673f3f1aa651fc3115e8
12447 should install library compat symlinks from library makefiles, not Targetdirs
commit 241c90a06e8d1708235651863df515a2d522a03a
12454 remove lint library machinery
commit 282d4a2d330d797757f16d55e1df9569f3e52d10
12666 libproc manpage bugs
commit d906f494f9407f1ae043a922478ce3609959caf5
12670 Unaligned output of snoop's usage() function
commit 18c4eaf123da22eddbe6e9a4ba7b8115ba748075
12669 Add omitted word in vmstat man page
commit b68ab351091d2aea3f72a011f64de12fb05fc833
12028 zfs test mdb_001_pos can fail
Conflicts:
usr/src/lib/nsswitch/dns/Makefile.com
usr/src/lib/libsff/Makefile
usr/src/lib/brand/Makefile
usr/src/lib/Makefile.lib
usr/src/lib/Makefile.targ
Diffstat (limited to 'usr/src/lib/fm')
76 files changed, 95 insertions, 292 deletions
diff --git a/usr/src/lib/fm/Makefile.subdirs b/usr/src/lib/fm/Makefile.subdirs index 3c8153f622..54c60a8d66 100644 --- a/usr/src/lib/fm/Makefile.subdirs +++ b/usr/src/lib/fm/Makefile.subdirs @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - .KEEP_STATE: all := TARGET += all @@ -33,9 +31,8 @@ clean := TARGET += clean clobber := TARGET += clobber install := TARGET += install install_h := TARGET += install_h -lint := TARGET += lint -all check clean clobber install install_h lint: $(SUBDIRS) +all check clean clobber install install_h: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) diff --git a/usr/src/lib/fm/libdiagcode/Makefile b/usr/src/lib/fm/libdiagcode/Makefile index c6a223942a..dddb7758dc 100644 --- a/usr/src/lib/fm/libdiagcode/Makefile +++ b/usr/src/lib/fm/libdiagcode/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -38,12 +36,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint test := TARGET= test .KEEP_STATE: -all clean clobber install lint test: $(SUBDIRS) +all clean clobber install test: $(SUBDIRS) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libdiagcode/Makefile.com b/usr/src/lib/fm/libdiagcode/Makefile.com index 6825f867ae..c534cee1bd 100644 --- a/usr/src/lib/fm/libdiagcode/Makefile.com +++ b/usr/src/lib/fm/libdiagcode/Makefile.com @@ -31,7 +31,7 @@ TSTOBJECTS = diagcode_test.o include ../../../Makefile.lib include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc CLOBBERFILES += test $(TSTOBJECTS) @@ -40,18 +40,12 @@ SRCDIR = ../common CFLAGS += $(CCVERBOSE) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 - .KEEP_STATE: all: install: -lint: lintcheck - test: $(TSTOBJECTS) $(PICS) $(LINK.c) -o $@ $(TSTOBJECTS) $(PICS) $(LDLIBS) ./test $(SRCDIR)/tests diff --git a/usr/src/lib/fm/libdiagcode/amd64/Makefile b/usr/src/lib/fm/libdiagcode/amd64/Makefile index d82d52e3a2..857d6be59c 100644 --- a/usr/src/lib/fm/libdiagcode/amd64/Makefile +++ b/usr/src/lib/fm/libdiagcode/amd64/Makefile @@ -23,11 +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 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libdiagcode/i386/Makefile b/usr/src/lib/fm/libdiagcode/i386/Makefile index 746a72389e..5da8e64ac5 100644 --- a/usr/src/lib/fm/libdiagcode/i386/Makefile +++ b/usr/src/lib/fm/libdiagcode/i386/Makefile @@ -23,10 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiagcode/sparc/Makefile b/usr/src/lib/fm/libdiagcode/sparc/Makefile index 746a72389e..5da8e64ac5 100644 --- a/usr/src/lib/fm/libdiagcode/sparc/Makefile +++ b/usr/src/lib/fm/libdiagcode/sparc/Makefile @@ -23,10 +23,9 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiagcode/sparcv9/Makefile b/usr/src/lib/fm/libdiagcode/sparcv9/Makefile index d82d52e3a2..857d6be59c 100644 --- a/usr/src/lib/fm/libdiagcode/sparcv9/Makefile +++ b/usr/src/lib/fm/libdiagcode/sparcv9/Makefile @@ -23,11 +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 all: $(LIBS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libdiskstatus/Makefile b/usr/src/lib/fm/libdiskstatus/Makefile index b051273f20..c0b2da68de 100644 --- a/usr/src/lib/fm/libdiskstatus/Makefile +++ b/usr/src/lib/fm/libdiskstatus/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../../Makefile.lib include ../Makefile.lib @@ -37,11 +36,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) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libdiskstatus/Makefile.com b/usr/src/lib/fm/libdiskstatus/Makefile.com index c22e5808eb..1b1821a314 100644 --- a/usr/src/lib/fm/libdiskstatus/Makefile.com +++ b/usr/src/lib/fm/libdiskstatus/Makefile.com @@ -36,7 +36,7 @@ OBJECTS= libdiskstatus.o \ include ../../../Makefile.lib include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common @@ -47,13 +47,9 @@ CPPFLAGS += $(INCS) # not linted SMATCH=off -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libdiskstatus/i386/Makefile b/usr/src/lib/fm/libdiskstatus/i386/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/fm/libdiskstatus/i386/Makefile +++ b/usr/src/lib/fm/libdiskstatus/i386/Makefile @@ -22,8 +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 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libdiskstatus/sparc/Makefile b/usr/src/lib/fm/libdiskstatus/sparc/Makefile index 741cbcaecd..2845cd3c2d 100644 --- a/usr/src/lib/fm/libdiskstatus/sparc/Makefile +++ b/usr/src/lib/fm/libdiskstatus/sparc/Makefile @@ -22,8 +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 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/Makefile b/usr/src/lib/fm/libfmd_adm/Makefile index a05449c6c5..7e1630fa8a 100644 --- a/usr/src/lib/fm/libfmd_adm/Makefile +++ b/usr/src/lib/fm/libfmd_adm/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -31,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_adm.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_adm/Makefile.com b/usr/src/lib/fm/libfmd_adm/Makefile.com index 6344075d73..6492244775 100644 --- a/usr/src/lib/fm/libfmd_adm/Makefile.com +++ b/usr/src/lib/fm/libfmd_adm/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CLEANFILES += fmd_rpc.c fmd_xdr.c fmd_rpc_adm.h fmd_rpc_adm.x SRCDIR = ../common @@ -44,19 +44,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += -_gcc=-Wno-unused-variable LDLIBS += -lnvpair -lnsl -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - fmd_rpc_adm.x: $(SRC)/cmd/fm/fmd/common/fmd_rpc_adm.x $(RM) $@; $(CP) $? $@ diff --git a/usr/src/lib/fm/libfmd_adm/amd64/Makefile b/usr/src/lib/fm/libfmd_adm/amd64/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_adm/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_adm/amd64/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_adm/i386/Makefile b/usr/src/lib/fm/libfmd_adm/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_adm/i386/Makefile +++ b/usr/src/lib/fm/libfmd_adm/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/sparc/Makefile b/usr/src/lib/fm/libfmd_adm/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_adm/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_adm/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_agent/Makefile b/usr/src/lib/fm/libfmd_agent/Makefile index d5b1c4d4c5..2f557e9f2b 100644 --- a/usr/src/lib/fm/libfmd_agent/Makefile +++ b/usr/src/lib/fm/libfmd_agent/Makefile @@ -29,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_agent.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_agent/Makefile.com b/usr/src/lib/fm/libfmd_agent/Makefile.com index e9f8f8bc84..8592738889 100644 --- a/usr/src/lib/fm/libfmd_agent/Makefile.com +++ b/usr/src/lib/fm/libfmd_agent/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = ../common/fmd_agent.c ../$(MACH)/fmd_agent_$(MACH).c -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -42,12 +42,6 @@ CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) LDLIBS += -lnvpair -lumem -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: @@ -55,12 +49,7 @@ pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -%.ln: ../$(MACH)/%.c - $(LINT.c) -o $@ $< - all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libfmd_agent/amd64/Makefile b/usr/src/lib/fm/libfmd_agent/amd64/Makefile index 92de54697e..c3c9b36567 100644 --- a/usr/src/lib/fm/libfmd_agent/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_agent/amd64/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_agent/i386/Makefile b/usr/src/lib/fm/libfmd_agent/i386/Makefile index 7c23244ca8..09efe516c2 100644 --- a/usr/src/lib/fm/libfmd_agent/i386/Makefile +++ b/usr/src/lib/fm/libfmd_agent/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_agent/sparc/Makefile b/usr/src/lib/fm/libfmd_agent/sparc/Makefile index 7c23244ca8..09efe516c2 100644 --- a/usr/src/lib/fm/libfmd_agent/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_agent/sparc/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile b/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile index 92de54697e..c3c9b36567 100644 --- a/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com include ../../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_log/Makefile b/usr/src/lib/fm/libfmd_log/Makefile index 03101f021b..a215b81f0a 100644 --- a/usr/src/lib/fm/libfmd_log/Makefile +++ b/usr/src/lib/fm/libfmd_log/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib @@ -31,18 +29,17 @@ include ../Makefile.lib FMHDRS = fmd_log.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_log/Makefile.com b/usr/src/lib/fm/libfmd_log/Makefile.com index 6bdfd3bbe0..0b37647952 100644 --- a/usr/src/lib/fm/libfmd_log/Makefile.com +++ b/usr/src/lib/fm/libfmd_log/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -43,19 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += $(CNOWARN_UNINIT) LDLIBS += -lexacct -lnvpair -lgen -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libfmd_log/amd64/Makefile b/usr/src/lib/fm/libfmd_log/amd64/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_log/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_log/amd64/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_log/i386/Makefile b/usr/src/lib/fm/libfmd_log/i386/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_log/i386/Makefile +++ b/usr/src/lib/fm/libfmd_log/i386/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_log/sparc/Makefile b/usr/src/lib/fm/libfmd_log/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libfmd_log/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_log/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_msg/Makefile b/usr/src/lib/fm/libfmd_msg/Makefile index d1a4ea590e..7f0ee6f127 100644 --- a/usr/src/lib/fm/libfmd_msg/Makefile +++ b/usr/src/lib/fm/libfmd_msg/Makefile @@ -29,19 +29,18 @@ include ../Makefile.lib FMHDRS = fmd_msg.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint test := TARGET = test .KEEP_STATE: -all clean clobber lint test: $(SUBDIRS) +all clean clobber test: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com index 471a550216..8b91946af2 100644 --- a/usr/src/lib/fm/libfmd_msg/Makefile.com +++ b/usr/src/lib/fm/libfmd_msg/Makefile.com @@ -34,7 +34,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -48,21 +48,13 @@ SMOFF += all_func_returns LDLIBS += -lnvpair -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 CLOBBERFILES += fmd_msg_test fmd_msg_test.core fmd_msg_test.out -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 - .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ @@ -97,6 +89,5 @@ test: install fmd_msg_test @echo fmd_msg_test: $(SRCDIR)/fmd_msg_test.c - $(LINT.c) $(SRCDIR)/fmd_msg_test.c $(LINK.c) -o fmd_msg_test $(SRCDIR)/fmd_msg_test.c \ $(LDLIBS_$(TARGETMACH)) -lfmd_msg -lnvpair -lumem diff --git a/usr/src/lib/fm/libfmd_msg/amd64/Makefile b/usr/src/lib/fm/libfmd_msg/amd64/Makefile index a2f97019c8..5cf65c4171 100644 --- a/usr/src/lib/fm/libfmd_msg/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_msg/amd64/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_msg/i386/Makefile b/usr/src/lib/fm/libfmd_msg/i386/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/fm/libfmd_msg/i386/Makefile +++ b/usr/src/lib/fm/libfmd_msg/i386/Makefile @@ -22,9 +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 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_msg/sparc/Makefile b/usr/src/lib/fm/libfmd_msg/sparc/Makefile index f91f0270e9..2845cd3c2d 100644 --- a/usr/src/lib/fm/libfmd_msg/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_msg/sparc/Makefile @@ -22,9 +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 -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile b/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile index a2f97019c8..5cf65c4171 100644 --- a/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_msg/sparcv9/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile b/usr/src/lib/fm/libfmd_snmp/Makefile index c73060ee5f..9589936bda 100644 --- a/usr/src/lib/fm/libfmd_snmp/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/Makefile @@ -29,7 +29,7 @@ include ../Makefile.lib FMHDRS = fmd_snmp.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) MIBFILES = SUN-FM-MIB.mib SUN-IREPORT-MIB.mib @@ -44,11 +44,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all lint clean clobber: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h install_mibs .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile index 90f182e191..9cdb9ed123 100644 --- a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmd_snmp/i386/Makefile b/usr/src/lib/fm/libfmd_snmp/i386/Makefile index 2a905ab007..bcf3356f62 100644 --- a/usr/src/lib/fm/libfmd_snmp/i386/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/i386/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm @@ -31,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile index 2a905ab007..bcf3356f62 100644 --- a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm @@ -31,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile index 90f182e191..9cdb9ed123 100644 --- a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64) @@ -32,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmevent/Makefile b/usr/src/lib/fm/libfmevent/Makefile index 909ee5b01e..263d54e9f6 100644 --- a/usr/src/lib/fm/libfmevent/Makefile +++ b/usr/src/lib/fm/libfmevent/Makefile @@ -38,18 +38,17 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) FMHDRS = libfmevent.h libfmevent_ruleset.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmevent/Makefile.com b/usr/src/lib/fm/libfmevent/Makefile.com index 81352b3076..8ea99e219d 100644 --- a/usr/src/lib/fm/libfmevent/Makefile.com +++ b/usr/src/lib/fm/libfmevent/Makefile.com @@ -47,7 +47,7 @@ ROOTLIBDIR= $(ROOTFS_LIBDIR)/fm ROOTLIBDIR64= $(ROOTFS_LIBDIR)/fm/$(MACH64) SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -72,21 +72,28 @@ $(DYNLIB) := LDLIBS += -lumem -lnvpair -luutil -lsysevent \ $(BUILD64)$(DYNLIB) := LDLIBS64 += -lumem -lnvpair -luutil -lsysevent \ -L$(ROOT)/$(FMLIBDIR64) -ltopo -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 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) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libfmevent/amd64/Makefile b/usr/src/lib/fm/libfmevent/amd64/Makefile index 0efa16d7ae..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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmevent/i386/Makefile b/usr/src/lib/fm/libfmevent/i386/Makefile index 1b8b367f7c..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) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparc/Makefile b/usr/src/lib/fm/libfmevent/sparc/Makefile index 1b8b367f7c..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) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/fm/libfmevent/sparcv9/Makefile b/usr/src/lib/fm/libfmevent/sparcv9/Makefile index 0efa16d7ae..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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/fm/libfmnotify/Makefile b/usr/src/lib/fm/libfmnotify/Makefile index 645e65ace4..c9c0d8bbdf 100644 --- a/usr/src/lib/fm/libfmnotify/Makefile +++ b/usr/src/lib/fm/libfmnotify/Makefile @@ -26,19 +26,18 @@ include ../../Makefile.lib include ../Makefile.lib -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint test := TARGET = test .KEEP_STATE: -all clean clobber lint test: $(SUBDIRS) +all clean clobber test: $(SUBDIRS) install: $(SUBDIRS) diff --git a/usr/src/lib/fm/libfmnotify/Makefile.com b/usr/src/lib/fm/libfmnotify/Makefile.com index d6a60e6fb1..61de9ecef1 100644 --- a/usr/src/lib/fm/libfmnotify/Makefile.com +++ b/usr/src/lib/fm/libfmnotify/Makefile.com @@ -33,7 +33,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -46,18 +46,10 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) $(DYNLIB) := LDLIBS += $(MACH_LDLIBS) $(DYNLIB) := LDLIBS += -lnvpair -lc -lfmd_msg -lfmevent -lscf -ldiagcode -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libfmnotify/amd64/Makefile b/usr/src/lib/fm/libfmnotify/amd64/Makefile index f0d686dced..e070d1346b 100644 --- a/usr/src/lib/fm/libfmnotify/amd64/Makefile +++ b/usr/src/lib/fm/libfmnotify/amd64/Makefile @@ -28,4 +28,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libfmnotify/i386/Makefile b/usr/src/lib/fm/libfmnotify/i386/Makefile index 4e86c1ee6b..1b80409fdf 100644 --- a/usr/src/lib/fm/libfmnotify/i386/Makefile +++ b/usr/src/lib/fm/libfmnotify/i386/Makefile @@ -24,7 +24,7 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) MACH_LDLIBS = -L$(ROOT)/usr/lib/fm diff --git a/usr/src/lib/fm/libfmnotify/sparc/Makefile b/usr/src/lib/fm/libfmnotify/sparc/Makefile index 686815ee32..e2c5373839 100644 --- a/usr/src/lib/fm/libfmnotify/sparc/Makefile +++ b/usr/src/lib/fm/libfmnotify/sparc/Makefile @@ -24,7 +24,7 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) MACH_LDLIBS = -L$(ROOT)/usr/lib/fm diff --git a/usr/src/lib/fm/libfmnotify/sparcv9/Makefile b/usr/src/lib/fm/libfmnotify/sparcv9/Makefile index c8c3d93095..b2435f5f59 100644 --- a/usr/src/lib/fm/libfmnotify/sparcv9/Makefile +++ b/usr/src/lib/fm/libfmnotify/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libldom/sparc/Makefile b/usr/src/lib/fm/libldom/sparc/Makefile index 1f0c37cf36..1f81c94cba 100644 --- a/usr/src/lib/fm/libldom/sparc/Makefile +++ b/usr/src/lib/fm/libldom/sparc/Makefile @@ -29,4 +29,4 @@ include ../Makefile.com DYNFLAGS += -R/usr/lib/fm -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libldom/sparcv9/Makefile b/usr/src/lib/fm/libldom/sparcv9/Makefile index 1c53dcd407..c641c73a5c 100644 --- a/usr/src/lib/fm/libldom/sparcv9/Makefile +++ b/usr/src/lib/fm/libldom/sparcv9/Makefile @@ -30,4 +30,4 @@ include ../../../Makefile.lib.64 DYNFLAGS += -R/usr/lib/fm/$(MACH64) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libmdesc/Makefile b/usr/src/lib/fm/libmdesc/Makefile index 8d529ad6b7..a3c7959a98 100644 --- a/usr/src/lib/fm/libmdesc/Makefile +++ b/usr/src/lib/fm/libmdesc/Makefile @@ -22,27 +22,24 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib include ../Makefile.lib -FMHDRS = +FMHDRS = HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libmdesc/Makefile.com b/usr/src/lib/fm/libmdesc/Makefile.com index c09447e182..bdc979605c 100644 --- a/usr/src/lib/fm/libmdesc/Makefile.com +++ b/usr/src/lib/fm/libmdesc/Makefile.com @@ -45,7 +45,7 @@ include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=$(SRC)/common/mdesc/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -54,24 +54,14 @@ CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS64) LDLIBS += -lc -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN -v -LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN -v -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: $(SRC)/common/mdesc/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -%.ln: $(SRC)/common/mdesc/%.c - $(LINT.c) -o $@ $< - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libmdesc/sparc/Makefile b/usr/src/lib/fm/libmdesc/sparc/Makefile index a333224278..282da97a76 100644 --- a/usr/src/lib/fm/libmdesc/sparc/Makefile +++ b/usr/src/lib/fm/libmdesc/sparc/Makefile @@ -22,9 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libmdesc/sparcv9/Makefile b/usr/src/lib/fm/libmdesc/sparcv9/Makefile index d7bfc90e79..9ebd5174c4 100644 --- a/usr/src/lib/fm/libmdesc/sparcv9/Makefile +++ b/usr/src/lib/fm/libmdesc/sparcv9/Makefile @@ -22,10 +22,8 @@ # 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) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/libseslog/Makefile b/usr/src/lib/fm/libseslog/Makefile index ee92d39246..dc6dda12c2 100644 --- a/usr/src/lib/fm/libseslog/Makefile +++ b/usr/src/lib/fm/libseslog/Makefile @@ -35,11 +35,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) install_h: $(ROOTFMHDRS) diff --git a/usr/src/lib/fm/libseslog/Makefile.com b/usr/src/lib/fm/libseslog/Makefile.com index 81beeab149..f5d0cffd0a 100644 --- a/usr/src/lib/fm/libseslog/Makefile.com +++ b/usr/src/lib/fm/libseslog/Makefile.com @@ -32,7 +32,7 @@ OBJECTS= libseslog.o include ../../../Makefile.lib include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR= ../common @@ -43,13 +43,9 @@ CPPFLAGS += $(INCS) # not linted SMATCH=off -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/lib/fm/libseslog/i386/Makefile b/usr/src/lib/fm/libseslog/i386/Makefile index d52ed62515..aca2105e57 100644 --- a/usr/src/lib/fm/libseslog/i386/Makefile +++ b/usr/src/lib/fm/libseslog/i386/Makefile @@ -24,4 +24,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/libseslog/sparc/Makefile b/usr/src/lib/fm/libseslog/sparc/Makefile index d0e9303902..68ca1b3183 100644 --- a/usr/src/lib/fm/libseslog/sparc/Makefile +++ b/usr/src/lib/fm/libseslog/sparc/Makefile @@ -22,4 +22,4 @@ # include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/amd64/Makefile b/usr/src/lib/fm/topo/libtopo/amd64/Makefile index 2506edb291..8e6904022e 100644 --- a/usr/src/lib/fm/topo/libtopo/amd64/Makefile +++ b/usr/src/lib/fm/topo/libtopo/amd64/Makefile @@ -22,12 +22,10 @@ # Copyright 2008 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 LDLIBS += -lzfs -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/topo/libtopo/i386/Makefile b/usr/src/lib/fm/topo/libtopo/i386/Makefile index cd8a4643d9..f510e2a2f4 100644 --- a/usr/src/lib/fm/topo/libtopo/i386/Makefile +++ b/usr/src/lib/fm/topo/libtopo/i386/Makefile @@ -22,11 +22,9 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com LDLIBS += -lzfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/sparc/Makefile b/usr/src/lib/fm/topo/libtopo/sparc/Makefile index 976e50cd5f..1ed4f42d3b 100644 --- a/usr/src/lib/fm/topo/libtopo/sparc/Makefile +++ b/usr/src/lib/fm/topo/libtopo/sparc/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,4 +30,4 @@ LDLIBS += -L$(ROOTLIBDIR) LDLIBS += -lzfs -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile index 9a45e99e29..7987e15fa0 100644 --- a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile +++ b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 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 @@ -33,4 +31,4 @@ LDLIBS += -L$(ROOTLIBDIR64) LDLIBS += -lzfs -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/fm/topo/maps/Makefile.map b/usr/src/lib/fm/topo/maps/Makefile.map index 0ed01490ec..643595b88c 100644 --- a/usr/src/lib/fm/topo/maps/Makefile.map +++ b/usr/src/lib/fm/topo/maps/Makefile.map @@ -81,17 +81,17 @@ clean: clobber: clean $(RM) $(CLOBBERFILES) -check: $(CHECKHDRS) +check: $(CHECKHDRS) $(TOPOFILE:%=%.chk) install_h _msg: -lint: $(TOPOFILE:%=%.chk) - %.xml.chk: %.xml @echo xmllint $< @xmllint --dropdtd $< | \ xmllint --noout --dtdvalid $(DTDSRC) - +%.usbtopo.chk: %.usbtopo + $($(CLASS)_ROOTTOPOROOT)/%: % $(INS.file) diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index bbd7cb76e7..a1827911a5 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -55,9 +55,6 @@ arch_ROOTCONF = $(ROOT)/usr/platform/$(ARCH)/lib/fm/topo/plugins/$(CONF) plat_ROOTCONF = $(PLATFORMS:%=$(ROOT)/usr/platform/%/lib/fm/topo/plugins/$(CONF)) ROOTCONF = $($(CLASS)_ROOTCONF) -LINTFLAGS = -msux -LINTFILES = $(MODULESRCS:%.c=%.ln) $(SHAREDSRCS:%.c=%.ln) - CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses @@ -77,7 +74,7 @@ DYNFLAGS += -R/usr/lib/fm all: $(PROG) .NO_PARALLEL: -.PARALLEL: $(OBJS) $(LINTFILES) +.PARALLEL: $(OBJS) $(PROG): $(OBJS) $(APIMAP) $(LINK.c) $(DYNFLAGS) $(OBJS) -o $@ $(LDLIBS) @@ -97,23 +94,11 @@ $(PROG): $(OBJS) $(APIMAP) $(CTFCONVERT_O) clean: - $(RM) $(OBJS) $(LINTFILES) $(CLEANFILES) + $(RM) $(OBJS) $(CLEANFILES) clobber: clean $(RM) $(PROG) $(CLOBBERFILES) -%.ln: ../../common/$(MODULE)/%.c - $(LINT.c) -c $< - -%.ln: ../../common/$(SHAREDMODULE)/%.c - $(LINT.c) -c $< - -%.ln: %.c - $(LINT.c) -c $< - -lint: $(LINTFILES) - $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS) - check: $(CHECKHDRS) install_h: diff --git a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile index bc9e4471fb..2512835499 100644 --- a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile +++ b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile @@ -45,10 +45,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(HBDIR) %.o: $(HBDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< - -%.ln: $(HBDIR)/%.c - $(LINT.c) -c $< - diff --git a/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile b/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile index 15cfd1a5ad..fcf55fb960 100644 --- a/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile +++ b/usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile @@ -50,6 +50,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(BRDIR) -I$(USBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip b/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip index b8bf7c87d9..473518739f 100644 --- a/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip +++ b/usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - MODULE = chip CLASS = arch SUN4DIR = ../../sun4/$(MODULE) @@ -38,6 +36,3 @@ CPPFLAGS += $(INCDIRS:%=-I%) %.o: $(SUN4DIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb b/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb index 342b44cb6d..287c845354 100644 --- a/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb +++ b/usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb @@ -44,9 +44,3 @@ CPPFLAGS += -I$(SUN4DIR) -I$(UTILDIR) -I$(HBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob b/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob index 63d42105d3..b86ee55548 100644 --- a/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob +++ b/usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob @@ -44,9 +44,3 @@ CPPFLAGS += -I$(UTILDIR) -I$(HBDIR) -I$(SUN4DIR) %.o: $(SUN4DIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci b/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci index 0600e71993..0a80dbf19a 100644 --- a/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci +++ b/usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci @@ -48,9 +48,3 @@ CPPFLAGS += -I$(SUN4DIR) -I$(UTILDIR) -I$(HBDIR) -I$(NICDIR) -I$(USBDIR) %.o: $(UTILDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - -%.ln: $(UTILDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile b/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile index 4593a1e970..c2d3d85d4a 100644 --- a/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile +++ b/usr/src/lib/fm/topo/modules/sun4v/chip/Makefile @@ -40,12 +40,6 @@ LDLIBS += -lumem -lmdesc -lldom $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(PRIDIR)/%.c - $(LINT.c) -c $< - %.o: $(PIDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(PIDIR)/%.c - $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile b/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile index 26add89806..20c0db5cbe 100644 --- a/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile +++ b/usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile @@ -49,9 +49,6 @@ CPPFLAGS += $(INCDIRS:%=-I%) $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(SUN4DIR)/%.c - $(LINT.c) -c $< - # end of what would be body of ../../sun4/mem/Makefile.mem LDLIBS += -lumem -lmdesc -lldom @@ -59,12 +56,6 @@ LDLIBS += -lumem -lmdesc -lldom $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -%.ln: $(PRIDIR)/%.c - $(LINT.c) -c $< - %.o: $(PIDIR)/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -%.ln: $(PIDIR)/%.c - $(LINT.c) -c $< |