diff options
Diffstat (limited to 'usr/src/lib/fm/topo')
-rw-r--r-- | usr/src/lib/fm/topo/libtopo/amd64/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/libtopo/i386/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/libtopo/sparc/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/libtopo/sparcv9/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/maps/Makefile.map | 6 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/Makefile.plugin | 19 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/i86pc/hostbridge/Makefile | 7 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/i86pc/x86pi/Makefile | 3 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4/chip/Makefile.chip | 5 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4/hostbridge/Makefile.hb | 6 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4/ioboard/Makefile.iob | 6 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4/pcibus/Makefile.pci | 6 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4v/chip/Makefile | 6 | ||||
-rw-r--r-- | usr/src/lib/fm/topo/modules/sun4v/dimm/Makefile | 9 |
14 files changed, 9 insertions, 80 deletions
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 $< |