Print this page
don't pass in lint libraries which no longer exist
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libshare/Makefile.com
+++ new/usr/src/lib/libshare/Makefile.com
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 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
22 22 #
23 23 LIBRARY = libshare.a
24 24 VERS = .1
25 25 NFSLIB_DIR = $(SRC)/cmd/fs.d/nfs/lib
26 26
27 27 LIBOBJS = libshare.o libsharecore.o scfutil.o libshare_zfs.o \
28 28 plugin.o parser.o issubdir.o
29 29 OTHOBJS = sharetab.o nfs_sec.o
↓ open down ↓ |
29 lines elided |
↑ open up ↑ |
30 30 OBJECTS = $(LIBOBJS) $(OTHOBJS)
31 31
32 32 include ../../Makefile.lib
33 33 SRCDIR = ../common
34 34
35 35 LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c)
36 36 # we don't want to lint the sharetab and nfs_sec files
37 37 lintcheck := SRCS = $(LIBSRCS)
38 38
39 39 LIBS = $(DYNLIB) $(LINTLIB)
40 -LDLIBS += -lc -lnsl -lscf -lzfs -luuid -lxml2 -lnvpair
40 +LDLIBS += -lc -lnsl -lscf -lzfs -luuid -lnvpair
41 41 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
42 42
43 +# libxml2 has no lint library, so we can only use it when building
44 +$(DYNLIB) := LDLIBS += -lxml2
45 +
43 46 #add nfs/lib directory as part of the include path
44 47 CFLAGS += $(CCVERBOSE)
45 48 CERRWARN += -_gcc=-Wno-parentheses
46 49 CERRWARN += -_gcc=-Wno-uninitialized
47 50 CERRWARN += -_gcc=-Wno-switch
48 51 CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \
49 52 -I$(ADJUNCT_PROTO)/usr/include/libxml2
50 53
51 54 .KEEP_STATE:
52 55
53 56 all: $(LIBS)
54 57
55 58 lint: lintcheck
56 59
57 60 pics/%.o: $(NFSLIB_DIR)/%.c
58 61 $(COMPILE.c) -o $@ $<
59 62 $(POST_PROCESS_O)
60 63
61 64 include ../../Makefile.targ
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX