summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authordougm <none@none>2006-11-02 20:03:37 -0800
committerdougm <none@none>2006-11-02 20:03:37 -0800
commit5359815feb11a102a85ff1b899512fa9553b8c25 (patch)
tree00065a3a485412551e78cbcca89d6be8d78810c6 /usr/src
parentc5608ce59546d1bc2e7c57e495af756f09c68d27 (diff)
downloadillumos-joyent-5359815feb11a102a85ff1b899512fa9553b8c25.tar.gz
6281048 NFS needs simplified administration (fix lint)
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/dfs.cmds/sharemgr/Makefile.com3
-rw-r--r--usr/src/cmd/dfs.cmds/sharemgr/plugins/Makefile.com3
-rw-r--r--usr/src/lib/libshare/Makefile.com3
3 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
index 3b62040ae3..da9961d6a3 100644
--- a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
+++ b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com
@@ -48,7 +48,8 @@ ROOTLINKS = $(ROOTUSRSBIN)/share $(ROOTUSRSBIN)/unshare
MYCPPFLAGS = -I../../../../lib/libfsmgt/common -I/usr/include/libxml2 \
-I../..
CPPFLAGS += $(MYCPPFLAGS)
-LDLIBS += -lshare -lxml2 -lscf -lsecdb -lumem
+LDLIBS += -lshare -lscf -lsecdb -lumem
+all install := LDLIBS += -lxml2
LINTFLAGS += -u
SRCS = $(SHAREMGR_SRC)
diff --git a/usr/src/cmd/dfs.cmds/sharemgr/plugins/Makefile.com b/usr/src/cmd/dfs.cmds/sharemgr/plugins/Makefile.com
index 4c93f157b8..202a452053 100644
--- a/usr/src/cmd/dfs.cmds/sharemgr/plugins/Makefile.com
+++ b/usr/src/cmd/dfs.cmds/sharemgr/plugins/Makefile.com
@@ -64,7 +64,8 @@ MYCPPFLAGS = -I$(SRC)/lib/libshare/common -I$(SRC)/lib/libfsmgt/common \
-I/usr/include/libxml2 -I.. -I../.. \
-I../../../../fs.d/nfs/lib
CPPFLAGS += $(MYCPPFLAGS)
-LDLIBS += -lshare -lxml2 -lnsl -lscf -lumem -lc
+LDLIBS += -lshare -lnsl -lscf -lumem -lc
+all install := LDLIBS += -lxml2
LDFLAGS += -zdefs -zcombreloc
CFLAGS += -Kpic
diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com
index d444041cf7..fc223320ee 100644
--- a/usr/src/lib/libshare/Makefile.com
+++ b/usr/src/lib/libshare/Makefile.com
@@ -50,7 +50,8 @@ ROOTHDRS= $(HDRS:%=$(ROOTDIRS)/%)
CHECKHDRS= $(HDRS:%.h=%.check)
LIBS = $(DYNLIB) $(LINTLIB)
-LDLIBS += -lc -lnsl -lscf -lxml2 -lzfs -luuid -lfsmgt
+LDLIBS += -lc -lnsl -lscf -lzfs -luuid -lfsmgt
+all install := LDLIBS += -lxml2
$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
SRCDIR = ../common