diff options
| author | Jason King <jason.brian.king@gmail.com> | 2017-06-12 18:10:37 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-06-19 11:07:42 -0400 |
| commit | f15a6fde3c0a52aca95943ffd637d7b8220e2261 (patch) | |
| tree | e9e0d3a46d33e10681ac4bd876335015273b8909 | |
| parent | 99d29265ec47e10c7ec8c18a67fc83e7dd5ce4f8 (diff) | |
| download | illumos-joyent-f15a6fde3c0a52aca95943ffd637d7b8220e2261.tar.gz | |
8379 illumos-gate 'install' make target is too eager building things
8360 ipdadm missing 'all' target
8359 libzpool Makefiles are slightly broken
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/ipdadm/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/Makefile.com | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 4f77662d45..26e0988215 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -25,7 +25,7 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2016 Toomas Soome <tsoome@me.com> -# Copyright 2016 Joyent, Inc. +# Copyright 2017 Joyent, Inc. # # @@ -123,7 +123,7 @@ stage-licenses: install2 install1: mapfiles closedbins sgs -install2: install1 $(SUBDIRS) +install2: install1 .WAIT $(SUBDIRS) _msg: _msgdirs rootdirs FRC @for m in $(MSGSUBDIRS); do \ diff --git a/usr/src/cmd/ipdadm/Makefile b/usr/src/cmd/ipdadm/Makefile index 349899e5f6..5f4690b32b 100644 --- a/usr/src/cmd/ipdadm/Makefile +++ b/usr/src/cmd/ipdadm/Makefile @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012 Joyent, Inc. All rights reserved. +# Copyright (c) 2017 Joyent, Inc. All rights reserved. # PROG= ipdadm @@ -40,6 +40,8 @@ lint: lint_PROG $(COMPILE.c) $< $(POST_PROCESS_O) -install: $(PROG) $(ROOTUSRSBINPROG) +all: $(PROG) + +install: all $(ROOTUSRSBINPROG) include ../Makefile.targ diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index b016ffaa70..17f24d1a11 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2017 Joyent, Inc. # LIBRARY= libzpool.a @@ -46,7 +47,7 @@ SRCDIR= ../common # There should be a mapfile here MAPFILES = -LIBS += $(LINTLIB) +LIBS += $(LINTLIB) $(DYNLIB) INCS += -I../common INCS += -I../../../uts/common/fs/zfs |