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/libfru/libnvfru | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libfru/libnvfru')
| -rw-r--r-- | usr/src/lib/libfru/libnvfru/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libfru/libnvfru/Makefile.com | 18 |
2 files changed, 3 insertions, 20 deletions
diff --git a/usr/src/lib/libfru/libnvfru/Makefile b/usr/src/lib/libfru/libnvfru/Makefile index a2c44539ab..b7c0896e0f 100644 --- a/usr/src/lib/libfru/libnvfru/Makefile +++ b/usr/src/lib/libfru/libnvfru/Makefile @@ -30,11 +30,10 @@ SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) # conditional assignments -all := TARGET= all +all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg sparc_HDRS= @@ -47,7 +46,7 @@ CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean clobber: $(SUBDIRS) _msg: $(MACH) $(MACH64) diff --git a/usr/src/lib/libfru/libnvfru/Makefile.com b/usr/src/lib/libfru/libnvfru/Makefile.com index 5dc2723b30..216f9d029f 100644 --- a/usr/src/lib/libfru/libnvfru/Makefile.com +++ b/usr/src/lib/libfru/libnvfru/Makefile.com @@ -35,25 +35,14 @@ CLOBBERFILES += $(LIBLINKS) LIBS = $(DYNLIB) -LINTFLAGS = -uxn -LINTFLAGS64 = $(LINTFLAGS) -m64 -LINTOUT= lint.out -LINTSRC = $(LINTLIB:%.ln=%) -ROOTLINTDIR = $(ROOTLIBDIR) -ROOTLINT = $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES= $(LINTOUT) - CPPFLAGS += -I.. \ -I$(SRC)/lib/libfru/include \ -I$(SRC)/lib/libfruutils -CPPFLAGS += -D_REENTRANT +CPPFLAGS += -D_REENTRANT CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch -$(LINTLIB) := LINTFLAGS = -nvx -I.. -$(LINTLIB) := LINTFLAGS64 = -nvx -m64 -I.. XGETFLAGS += -a @@ -61,14 +50,9 @@ XGETFLAGS += -a all : $(LIBS) -lint : lintcheck - # include library targets include $(SRC)/lib/Makefile.targ pics/%.o: ../%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -$(ROOTLINTDIR)/%: ../% - $(INS.file) |