summaryrefslogtreecommitdiff
path: root/usr/src/cmd/rcm_daemon
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/rcm_daemon')
-rw-r--r--usr/src/cmd/rcm_daemon/Makefile6
-rw-r--r--usr/src/cmd/rcm_daemon/Makefile.com31
2 files changed, 11 insertions, 26 deletions
diff --git a/usr/src/cmd/rcm_daemon/Makefile b/usr/src/cmd/rcm_daemon/Makefile
index 6145ba954b..e508afa483 100644
--- a/usr/src/cmd/rcm_daemon/Makefile
+++ b/usr/src/cmd/rcm_daemon/Makefile
@@ -19,9 +19,6 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
# All rights reserved.
#
@@ -40,7 +37,6 @@ install := TARGET= install
clean := TARGET= clean
clobber := TARGET= clobber
_msg := TARGET= _msg
-lint := TARGET= lint
install_h := TARGET= install_h
#definitions for install_h target
@@ -54,7 +50,7 @@ $(ROOTHDRS) := FILEMODE = 644
install: install_h $(SUBDIRS)
-all lint _msg: install_h $(SUBDIRS)
+all _msg: install_h $(SUBDIRS)
clean clobber: $(SUBDIRS)
$(SUBDIRS): FRC
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index cf9f5b0143..a091064c93 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -109,8 +109,6 @@ SCRIPT_DIR = scripts
CLOBBERFILES += $(COMMON_RCM_MODS) $($(MACH)_RCM_MODS) $(RCM_DAEMON)
-LINT_MODULES = $(COMMON_MOD_SRC:.c=.ln) $($(MACH)_MOD_SRC:.c=.ln)
-
CPPFLAGS += -I..
CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
CFLAGS += $(CCVERBOSE) $(C_PICFLAGS)
@@ -126,18 +124,18 @@ SMATCH=off
MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
rcm_daemon := LDFLAGS += $(MAPFILES:%=-M%)
-LINTFLAGS += -u -erroff=E_FUNC_ARG_UNUSED
-
LDLIBS_MODULES =
-SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool
-SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
-SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
-SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
-SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
-SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
-SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm
+SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool -lnvpair
+SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair -ldevinfo
+SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm -lnvpair -lsocket -lgen
SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil
-SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
+SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm -lnvpair
+SUNW_mpxio_rcm.so := LDLIBS_MODULES += -ldevinfo
+LDLIBS_MODULES += -L$(ROOT)/lib -lrcm -lc
LDLIBS += -lgen -lelf -lrcm -lnvpair -ldevinfo -lnsl -lsocket
@@ -166,7 +164,6 @@ all := TARGET= all
install := TARGET= install
clean := TARGET= clean
clobber := TARGET= clobber
-lint := TARGET= lint
$(ROOTLIB_RCM_SCRIPTS) := FILEMODE = 555
@@ -187,14 +184,6 @@ install: all \
clean:
$(RM) $(RCM_OBJ) $(COMMON_MOD_OBJ) $($(MACH)_MOD_OBJ) $(POFILES)
-lint: $(RCM_DAEMON).ln $(LINT_MODULES)
-
-$(RCM_DAEMON).ln: FRC
- $(LINT.c) $(RCM_SRC) $(LDLIBS)
-
-%.ln: FRC
- $(LINT.c) $(RCM_SRC) $(@:.ln=.c) $(LDLIBS)
-
FRC:
include ../../Makefile.targ