diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/fm/libfmd_agent | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/fm/libfmd_agent')
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/Makefile.com | 13 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmd_agent/sparcv9/Makefile | 2 |
6 files changed, 7 insertions, 19 deletions
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) |