diff options
| author | stevel <none@none> | 2006-04-04 22:01:26 -0700 |
|---|---|---|
| committer | stevel <none@none> | 2006-04-04 22:01:26 -0700 |
| commit | 54b87f36013e24df61bad509c5ace8fec06df144 (patch) | |
| tree | 00b1608cf6f985c8f182ff6c3ba311479000f3a3 /usr/src | |
| parent | fbe11206db4391b82fba7663eadb2ca3ee8b2ee1 (diff) | |
| download | illumos-joyent-54b87f36013e24df61bad509c5ace8fec06df144.tar.gz | |
6393890 move libprtdiag_psr to usr/src (fix open build)
6393898 move scadm to usr/src (fix open build)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/scadm/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/cmd/scadm/Makefile.targ | 9 | ||||
| -rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/usr/src/cmd/scadm/Makefile.com b/usr/src/cmd/scadm/Makefile.com index 20d419b9a0..f45ad9b8a4 100644 --- a/usr/src/cmd/scadm/Makefile.com +++ b/usr/src/cmd/scadm/Makefile.com @@ -20,7 +20,7 @@ # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -83,8 +83,14 @@ IFLAGS = -I$(SRCDIR) -I$(USR_PSM_INCL_DIR) \ CPPFLAGS = $(IFLAGS) $(CPPFLAGS.master) -D_SYSCALL32 +LINKED_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%) +LINKED_SBIN_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%/sbin) + .PARALLEL: $(OBJS) +$(LINKED_SBIN_DIRS): $(LINKED_DIRS) + -$(INS.dir.root.sys) + %.o: common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/cmd/scadm/Makefile.targ b/usr/src/cmd/scadm/Makefile.targ index 9264186947..4e750ab2b6 100644 --- a/usr/src/cmd/scadm/Makefile.targ +++ b/usr/src/cmd/scadm/Makefile.targ @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -30,6 +29,8 @@ install: all $(USR_PSM_SBIN_PROG) $(USR_PSM_SBIN_PROG_LINKS) +$(USR_PSM_SBIN_PROG_LINKS): $(LINKED_SBIN_DIRS) + $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile index f0e48afa83..b028d2276b 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile @@ -95,7 +95,7 @@ $(LINKED_DIRS): $(USR_PLAT_DIR) $(LINKED_LIB_DIRS): $(LINKED_DIRS) -$(INS.dir.root.sys) -$(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) +$(LINKED_PRTDIAG_DIRS): $(LINKED_LIB_DIRS) -$(INS.slink6) # |