diff options
| author | John Levon <john.levon@joyent.com> | 2018-12-17 23:44:05 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2019-01-14 19:06:48 +0000 |
| commit | 5661bb7641e85c46713da7a3002b29ecd2c3daf0 (patch) | |
| tree | e0d0a4ec2e103c5c62feb664509414cd03f9f24e /usr/src/cmd/print | |
| parent | 05ede3db5e3b7d540afbccdc872c735770e82ef3 (diff) | |
| download | illumos-joyent-5661bb7641e85c46713da7a3002b29ecd2c3daf0.tar.gz | |
10080 smatch Makefile changes for usr/src/cmd
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/print')
| -rw-r--r-- | usr/src/cmd/print/bsd-sysv-commands/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/cmd/print/conv_fix/Makefile | 8 | ||||
| -rw-r--r-- | usr/src/cmd/print/lpset/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/cmd/print/printer-info/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/print/printer-info/printer-info.c | 5 | ||||
| -rw-r--r-- | usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile | 4 |
6 files changed, 26 insertions, 12 deletions
diff --git a/usr/src/cmd/print/bsd-sysv-commands/Makefile b/usr/src/cmd/print/bsd-sysv-commands/Makefile index ee6131c805..cb71a89a43 100644 --- a/usr/src/cmd/print/bsd-sysv-commands/Makefile +++ b/usr/src/cmd/print/bsd-sysv-commands/Makefile @@ -22,7 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# +# Copyright (c) 2018, Joyent, Inc. include ../Makefile.sp @@ -67,6 +67,9 @@ in.lpd:= LDLIBS += -lnsl -lsocket CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized +# not linted +SMATCH=off + all: $(BINPROGS) $(SBINPROGS) # each program needs common.o as well diff --git a/usr/src/cmd/print/conv_fix/Makefile b/usr/src/cmd/print/conv_fix/Makefile index cac80619e0..73b53b46af 100644 --- a/usr/src/cmd/print/conv_fix/Makefile +++ b/usr/src/cmd/print/conv_fix/Makefile @@ -22,8 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/lp/client/conv_fix/Makefile -# +# Copyright (c) 2018, Joyent, Inc. include ../Makefile.sp @@ -41,11 +40,14 @@ CPPFLAGS += -I$(NPRTINC) CERRWARN += -_gcc=-Wno-implicit-function-declaration +# not linted +SMATCH=off + .KEEP_STATE: all: $(PROG) -install: all $(ROOTLIBPRINTPROG) +install: all $(ROOTLIBPRINTPROG) $(ROOTLIBPRINT)/%: % $(INS.file) diff --git a/usr/src/cmd/print/lpset/Makefile b/usr/src/cmd/print/lpset/Makefile index 7b81c117b2..1929022f9f 100644 --- a/usr/src/cmd/print/lpset/Makefile +++ b/usr/src/cmd/print/lpset/Makefile @@ -22,8 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/lp/client/lpset/Makefile -# +# Copyright (c) 2018, Joyent, Inc. include ../Makefile.sp @@ -39,13 +38,17 @@ FILEMODE= 04511 CPPFLAGS += -I$(NPRTINC) CERRWARN += -_gcc=-Wno-implicit-function-declaration + +# not linted +SMATCH=off + LDLIBS += $(LIBNPRT) -lsecdb .KEEP_STATE: all: $(PROG) -install: all $(ROOTBIN) $(ROOTBINPROG) +install: all $(ROOTBIN) $(ROOTBINPROG) $(ROOTBIN): $(INS.dir) diff --git a/usr/src/cmd/print/printer-info/Makefile b/usr/src/cmd/print/printer-info/Makefile index 1aed6ba8f5..cbeb335826 100644 --- a/usr/src/cmd/print/printer-info/Makefile +++ b/usr/src/cmd/print/printer-info/Makefile @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. include ../Makefile.sp @@ -34,8 +35,6 @@ OBJECTS = $(PROG).o ROOTPROG= $(PROG:%=$(ROOTLIBLPBIN)/%) $(ROOTPROG) := FILEMODE=555 -CERRWARN += -_gcc=-Wno-implicit-function-declaration - .KEEP_STATE: all: $(PROG) @@ -46,13 +45,13 @@ $(ROOTLIBLPBIN): $(ROOTLIBLPBIN)/%: % $(INS.file) -install: all $(ROOTLIBLPBIN) $(ROOTPROG) +install: all $(ROOTLIBLPBIN) $(ROOTPROG) $(PROGRAM): $(OBJECTS) $(CC) $(CFLAGS) -o $@ $(OBJECTS) clean: - $(RM) $(PROG) *.o + $(RM) $(PROG) *.o cstyle: cstyle $(SRCS) diff --git a/usr/src/cmd/print/printer-info/printer-info.c b/usr/src/cmd/print/printer-info/printer-info.c index a469c5194d..dddf0d3a68 100644 --- a/usr/src/cmd/print/printer-info/printer-info.c +++ b/usr/src/cmd/print/printer-info/printer-info.c @@ -24,9 +24,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2018, Joyent, Inc. + */ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <sys/ioctl.h> diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile index 690b18ccfa..187517ea11 100644 --- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile +++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. # # Makefile for Java Print Manager server @@ -86,6 +87,9 @@ CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris -I. CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized +# not linted +SMATCH=off + LDLIBS += -lprint -lnsl -lsocket -lc CLEANFILES= *.class $(LINTLIB) $(LINTOUT) |
