diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
| commit | c01753e18ca18fcdabe7ca7868cf40dd18290c51 (patch) | |
| tree | e38a71b71cf3eef7d8a8112dfb2055d5463b80eb /usr/src/cmd/dladm | |
| parent | 0c4959f576fd0569de9fb1c72946987be101e7a0 (diff) | |
| parent | ad309d3e2ef712dfdf1bc08758f232ebd5fe1612 (diff) | |
| download | illumos-joyent-c01753e18ca18fcdabe7ca7868cf40dd18290c51.tar.gz | |
[illumos-gate merge]
commit ad309d3e2ef712dfdf1bc08758f232ebd5fe1612
7761 bootfs_005_neg's pool destruction must handle EBUSY
commit 555da5111b0f2552c42d057b211aba89c9c79f6c
7743 per-vdev-zaps have no initialize path on upgrade
commit 0e93ddde309a21971dc41356b4834acecaeb9e20
7739 zfs_inherit_003_pos fails due to improperly generated random strings
commit 4648396c072c3d0c2a1a38afa5f6717799eb1ac7
7731 libdladm`i_dladm_set_single_prop() leaks memory when resetting properties without default value
commit 5f10ef697f250374b7b917e10961c4e02d4e3112
6396 remove SVM
Conflicts:
usr/src/cmd/dladm/Makefile
usr/src/cmd/Makefile.check
usr/src/lib/Makefile
usr/src/Makefile.lint
Diffstat (limited to 'usr/src/cmd/dladm')
| -rw-r--r-- | usr/src/cmd/dladm/Makefile | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/usr/src/cmd/dladm/Makefile b/usr/src/cmd/dladm/Makefile index 1f07bbd714..b0ebe6c7fc 100644 --- a/usr/src/cmd/dladm/Makefile +++ b/usr/src/cmd/dladm/Makefile @@ -18,54 +18,62 @@ # # CDDL HEADER END # + # # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright 2015 Joyent, Inc. # -PROG= dladm -CFGFILES= secobj.conf - +PROG= dladm ROOTFS_PROG= $(PROG) +OBJS= dladm.o + +CFGFILES= secobj.conf ROOTCFGDIR= $(ROOTETC)/dladm ROOTCFGFILES= $(CFGFILES:%=$(ROOTCFGDIR)/%) -include ../Makefile.cmd +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.ctf -XGETFLAGS += -a -x $(PROG).xcl -LDLIBS += -L$(ROOT)/lib -lsocket -LDLIBS += -ldladm -ldlpi -lkstat -lsecdb -lbsm -linetutil -ldevinfo -LDLIBS += $(ZLAZYLOAD) -lrstp $(ZNOLAZYLOAD) -lnsl -lumem -lcmdutils +XGETFLAGS += -a -x $(PROG).xcl -CERRWARN += -_gcc=-Wno-switch -CERRWARN += -_gcc=-Wno-unused-label -CERRWARN += -_gcc=-Wno-uninitialized +LDLIBS += -L$(ROOT)/lib -lsocket +LDLIBS += -ldladm -ldlpi -lkstat -lsecdb -lbsm -linetutil -ldevinfo +LDLIBS += $(ZLAZYLOAD) -lrstp $(ZNOLAZYLOAD) -lnsl -lumem -lcmdutils + +CERRWARN += -_gcc=-Wno-switch +CERRWARN += -_gcc=-Wno-unused-label +CERRWARN += -_gcc=-Wno-uninitialized # For headers from librstp. LINTFLAGS += -erroff=E_TRAILING_COMMA_IN_ENUM +lint := ZLAZYLOAD= +lint := ZNOLAZYLOAD= $(ROOTCFGDIR)/secobj.conf := FILEMODE= 660 -lint := ZLAZYLOAD= -lint := ZNOLAZYLOAD= - .KEEP_STATE: -all: $(ROOTFS_PROG) +all: $(PROG) -install: all $(ROOTSBINPROG) $(ROOTCFGDIR) $(ROOTCFGFILES) - $(RM) $(ROOTUSRSBINPROG) - -$(SYMLINK) ../../sbin/$(PROG) $(ROOTUSRSBINPROG) +$(PROG): $(OBJS) + $(LINK.c) $(OBJS) -o $@ $(LDLIBS) + $(POST_PROCESS) clean: + $(RM) $(OBJS) + +install: all $(ROOTSBINPROG) $(ROOTCFGDIR) $(ROOTCFGFILES) + $(RM) $(ROOTUSRSBINPROG) + -$(SYMLINK) ../../sbin/$(PROG) $(ROOTUSRSBINPROG) -lint: lint_PROG +lint: lint_PROG $(ROOTCFGDIR): - $(INS.dir) + $(INS.dir) $(ROOTCFGDIR)/%: $(ROOTCFGDIR) % - $(INS.file) + $(INS.file) -include ../Makefile.targ +include $(SRC)/cmd/Makefile.targ |