Print this page
Reduce lint
OS-3280 need a way to specify the root of a native system in the lx brand
OS-3279 lx brand should allow delegated datasets
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/ptools/Makefile.bld
+++ new/usr/src/cmd/ptools/Makefile.bld
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
24 24 # Use is subject to license terms.
25 25 #
26 26
27 27 PROG:sh = basename `cd ..; pwd`
28 28
29 29 OBJS = $(PROG).o
30 30
31 31 SRCS = ../$(PROG).c
32 32
33 33 FILEMODE = 0555
34 34
35 35 # libproc is added individually as pwait doesn't need it.
36 36 # These are defined this way so lint can use them
37 37 LDLIBS_pargs = -lproc
38 38 LDLIBS_pcred = -lproc
39 39 LDLIBS_pfiles = -lproc -lnsl
40 40 LDLIBS_pflags = -lproc
41 41 LDLIBS_pldd = -lproc
42 42 LDLIBS_plgrp = -lproc -llgrp
43 43 LDLIBS_pmap = -lproc
44 44 LDLIBS_pmadvise = -lproc
45 45 LDLIBS_ppriv = -lproc
46 46 LDLIBS_preap = -lproc
47 47 LDLIBS_prun = -lproc
48 48 LDLIBS_psig = -lproc
49 49 LDLIBS_pstack = -lproc -lc_db
50 50 LDLIBS_pstop = -lproc
51 51 LDLIBS_ptime = -lproc
52 52 LDLIBS_ptree = -lproc -lcontract
53 53 LDLIBS_pwdx = -lproc
54 54
55 55 LDLIBS += $(LDLIBS_$(PROG))
56 56
57 57 CERRWARN_plgrp += -_gcc=-Wno-parentheses
58 58
59 59 CERRWARN_ppriv += -_gcc=-Wno-parentheses
60 60 CERRWARN_ppriv += -_gcc=-Wno-uninitialized
61 61
|
↓ open down ↓ |
61 lines elided |
↑ open up ↑ |
62 62 CERRWARN_ptree += -_gcc=-Wno-parentheses
63 63
64 64 CERRWARN_pstack += -_gcc=-Wno-uninitialized
65 65 CERRWARN_pstack += -_gcc=-Wno-clobbered
66 66
67 67 CERRWARN_pargs += -_gcc=-Wno-clobbered
68 68 CERRWARN_pargs += -_gcc=-Wno-type-limits
69 69
70 70 CERRWARN += $(CERRWARN_$(PROG))
71 71
72 +#
73 +# Common code definitions
74 +#
75 +COBJS = ptools_common.o
76 +CINC = -I../../common
77 +
72 78 # pargs depends on ../../common/elfcap components
73 79 # pmadvise depends on pmap components
74 80
75 81 ELFCAP = $(SRC)/common/elfcap
76 82 PMAP = $(SRC)/cmd/ptools/pmap
77 83
78 84 CPPFLAGS_pargs = -I$(ELFCAP)
79 85 OBJS_pargs = elfcap.o
80 86 SRCS_pargs = $(ELFCAP)/elfcap.c
81 87
82 -CPPFLAGS_pmap = -I$(PMAP)
83 -OBJS_pmap = pmap_common.o
88 +CPPFLAGS_pmap = -I$(PMAP) $(CINC)
89 +OBJS_pmap = pmap_common.o $(COBJS)
84 90 SRCS_pmap = $(PMAP)/pmap_common.c
85 91
86 -CPPFLAGS_pmadvise = -I$(PMAP)
87 -OBJS_pmadvise = pmap_common.o
92 +CPPFLAGS_pmadvise = -I$(PMAP) $(CINC)
93 +OBJS_pmadvise = pmap_common.o $(COBJS)
88 94 SRCS_pmadvise = $(PMAP)/pmap_common.c
89 95
96 +CPPFLAGS_preap = $(CINC)
97 +OBJS_preap = $(COBJS)
98 +
99 +CPPFLAGS_psig = $(CINC)
100 +OBJS_psig = $(COBJS)
101 +
102 +CPPFLAGS_ptime = $(CINC)
103 +OBJS_ptime = $(COBJS)
104 +
105 +CPPFLAGS_ptree = $(CINC)
106 +OBJS_ptree = $(COBJS)
107 +
108 +CPPFLAGS_pwait = $(CINC)
109 +OBJS_pwait = $(COBJS)
110 +
111 +CPPFLAGS_pwdx = $(CINC)
112 +OBJS_pwdx = $(COBJS)
113 +
90 114 CPPFLAGS += $(CPPFLAGS_$(PROG))
91 115 OBJS += $(OBJS_$(PROG))
92 116 SRCS += $(SRCS_$(PROG))
93 117
118 +# For lint, always include ptools_common.c, but suppress the "defined but
119 +# not used" error, in case a given ptool doesn't need it.
120 +SRCS += ../../common/ptools_common.c
121 +LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
122 +LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2
123 +
94 124 INSTALL_NEW=
95 125 INSTALL_LEGACY=$(RM) $(ROOTPROCBINSYMLINK) ; \
96 126 $(LN) -s ../../bin/$(PROG) $(ROOTPROCBINSYMLINK)
97 127
98 128 .KEEP_STATE:
99 129
100 130 elfcap.o: $(ELFCAP)/elfcap.c
101 131 $(COMPILE.c) -o $@ $(ELFCAP)/elfcap.c
102 132
103 133 pmap_common.o: $(PMAP)/pmap_common.c
104 134 $(COMPILE.c) -o $@ $(PMAP)/pmap_common.c
105 135
106 136 %.o: ../%.c
107 137 $(COMPILE.c) $<
108 138
139 +%.o: ../../common/%.c
140 + $(COMPILE.c) $<
141 + $(POST_PROCESS_O)
142 +
109 143 all: $(PROG)
110 144
111 145 ROOTBINPROG=$(ROOTBIN)/$(PROG)
112 146 ROOTPROCBINSYMLINK=$(ROOT)/usr/proc/bin/$(PROG)
113 147
114 148 $(PROG): $$(OBJS)
115 149 $(LINK.c) $(OBJS) -o $@ $(LDLIBS)
116 150 $(POST_PROCESS)
117 151
118 152 #
119 153 # Install the ptool, symlinking it into /usr/proc/bin if PTOOL_TYPE is set
120 154 # to LEGACY.
121 155 #
122 156 install: all $(ROOTISAPROG)
123 157 -$(RM) $(ROOTBINPROG)
124 158 -$(LN) $(ISAEXEC) $(ROOTBINPROG)
125 159 -$(INSTALL_$(PTOOL_TYPE))
126 160
127 161 clean:
128 162 $(RM) $(OBJS)
129 163
130 164 lint:
131 165 $(LINT.c) $(SRCS) $(LDLIBS)
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX