diff options
Diffstat (limited to 'usr/src/cmd/fs.d')
| -rw-r--r-- | usr/src/cmd/fs.d/smbclnt/test/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/cmd/fs.d/ufs/mkfs/Makefile | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/usr/src/cmd/fs.d/smbclnt/test/Makefile b/usr/src/cmd/fs.d/smbclnt/test/Makefile index 64b626f5a4..affd6d9a00 100644 --- a/usr/src/cmd/fs.d/smbclnt/test/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/test/Makefile @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2019, Joyent, Inc. # include $(SRC)/cmd/Makefile.cmd @@ -43,7 +44,7 @@ INST_CMDS = $(PROG:%=$(TESTDIR)/%) CPPFLAGS += -I../../../../uts/common CPPFLAGS += -I../../../../lib/libsmbfs -LDLIBS += -R '$$ORIGIN/../../../usr/lib' +LDLIBS += -R'$$ORIGIN/../../../usr/lib' LDLIBS += -lsmbfs LINTLIBS= -L$(ROOTLIB) -lsmbfs @@ -51,6 +52,9 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CSTD= $(CSTD_GNU99) +# not linted +SMATCH=off + LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 # CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/ufs/mkfs/Makefile b/usr/src/cmd/fs.d/ufs/mkfs/Makefile index 6b10524058..1df1d8c86d 100644 --- a/usr/src/cmd/fs.d/ufs/mkfs/Makefile +++ b/usr/src/cmd/fs.d/ufs/mkfs/Makefile @@ -22,6 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2019, Joyent, Inc. +# FSTYPE= ufs LIBPROG= mkfs @@ -30,6 +32,8 @@ ATTMK= $(LIBPROG) include ../../Makefile.fstype include ../Makefile.roll +CPPFLAGS += -I../../ + OBJS= $(LIBPROG).o $(ROLLOBJS) $(FSLIB) SRCS= $(LIBPROG).c $(ROLLSRCS) $(FSLIBSRC) MKFSOBJS= mkfs.o @@ -39,6 +43,9 @@ CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-empty-body CERRWARN += -_gcc=-Wno-uninitialized +# can't hack main() ! +SMATCH = off + # for messaging catalog # POFILE= mkfs.po |