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/mpapi | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/mpapi')
| -rw-r--r-- | usr/src/lib/mpapi/libmpapi/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/mpapi/libmpapi/Makefile.com | 6 | ||||
| -rw-r--r-- | usr/src/lib/mpapi/libmpapi/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/mpapi/libmpapi/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/mpapi/libmpscsi_vhci/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com | 3 |
6 files changed, 7 insertions, 12 deletions
diff --git a/usr/src/lib/mpapi/libmpapi/Makefile b/usr/src/lib/mpapi/libmpapi/Makefile index ebad6d797d..1e8d9c5bb4 100644 --- a/usr/src/lib/mpapi/libmpapi/Makefile +++ b/usr/src/lib/mpapi/libmpapi/Makefile @@ -32,14 +32,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRS = mpapi.h mpapi-sun.h HDRDIR = common .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com index cc109f0534..eefe784d72 100644 --- a/usr/src/lib/mpapi/libmpapi/Makefile.com +++ b/usr/src/lib/mpapi/libmpapi/Makefile.com @@ -31,12 +31,11 @@ OBJECTS= mpapi.o mpapi-sun.o include ../../../Makefile.lib include ../../../Makefile.rootfs -SRCDIR = ../common +SRCDIR = ../common -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRCDIR) -mt $(CCVERBOSE) -D_POSIX_PTHREAD_SEMANTICS @@ -61,7 +60,6 @@ $(IETCFILES) := FILEMODE = 0644 all: $(LIBS) $(IETCFILES) -lint: $(ROOTETC)/%: $(CONFDIR)/% $(INS.file) diff --git a/usr/src/lib/mpapi/libmpapi/i386/Makefile b/usr/src/lib/mpapi/libmpapi/i386/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/mpapi/libmpapi/i386/Makefile +++ b/usr/src/lib/mpapi/libmpapi/i386/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/mpapi/libmpapi/sparc/Makefile b/usr/src/lib/mpapi/libmpapi/sparc/Makefile index c7cca61bea..4acb0bde30 100644 --- a/usr/src/lib/mpapi/libmpapi/sparc/Makefile +++ b/usr/src/lib/mpapi/libmpapi/sparc/Makefile @@ -25,4 +25,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile index f7e3396ef5..80ea5ec505 100644 --- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile +++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile @@ -32,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: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: diff --git a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com index 023d711284..70d66cdfb1 100644 --- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com +++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com @@ -57,7 +57,7 @@ OBJECTS= Initialize.o MP_AssignLogicalUnitToTPG.o \ include ../../../Makefile.lib include ../../../Makefile.rootfs -SRCDIR = ../common +SRCDIR = ../common LIBS = $(DYNLIB) LDLIBS += -lc -ldevinfo -lsysevent -lnvpair @@ -73,6 +73,5 @@ SMATCH=off all: $(LIBS) -lint: lintcheck include ../../../Makefile.targ |