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/libfmnotify | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/fm/libfmnotify')
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/libfmnotify/sparcv9/Makefile | 2 |
6 files changed, 7 insertions, 16 deletions
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) |