diff options
author | Richard Lowe <richlowe@richlowe.net> | 2021-03-02 16:56:15 -0600 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2021-05-04 13:46:34 -0500 |
commit | f96a0cef040313f6281fbc014a0b63d5c5cc760f (patch) | |
tree | 6051c4badbcfc8f0a09132dc273dc8df0f5a3308 | |
parent | 59460b493cd70b38e999010c370d57e58b989e45 (diff) | |
download | illumos-joyent-f96a0cef040313f6281fbc014a0b63d5c5cc760f.tar.gz |
13762 stop passing MFLAGS to make(1)
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
45 files changed, 61 insertions, 114 deletions
diff --git a/usr/src/boot/Makefile b/usr/src/boot/Makefile index f7a0b29fad..11d0eea7c2 100644 --- a/usr/src/boot/Makefile +++ b/usr/src/boot/Makefile @@ -27,6 +27,6 @@ clobber := TARGET = clobber all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/Makefile b/usr/src/boot/sys/boot/Makefile index dacf28287c..1ffdce7185 100644 --- a/usr/src/boot/sys/boot/Makefile +++ b/usr/src/boot/sys/boot/Makefile @@ -40,6 +40,6 @@ install: all .WAIT $(INSTDIRS) .PARALLEL: libstand libficl libcrypto $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/efi/Makefile b/usr/src/boot/sys/boot/efi/Makefile index db9c643e2c..76032c7603 100644 --- a/usr/src/boot/sys/boot/efi/Makefile +++ b/usr/src/boot/sys/boot/efi/Makefile @@ -30,6 +30,6 @@ loader: libefi .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/efi/libefi/Makefile b/usr/src/boot/sys/boot/efi/libefi/Makefile index c6603510cc..6ba07bc880 100644 --- a/usr/src/boot/sys/boot/efi/libefi/Makefile +++ b/usr/src/boot/sys/boot/efi/libefi/Makefile @@ -30,6 +30,6 @@ install: all .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/sys/boot/efi/loader/Makefile index 698f498258..f69f4b3c06 100644 --- a/usr/src/boot/sys/boot/efi/loader/Makefile +++ b/usr/src/boot/sys/boot/efi/loader/Makefile @@ -29,6 +29,6 @@ all clean clobber install: $(SUBDIRS) .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/libcrypto/Makefile b/usr/src/boot/sys/boot/libcrypto/Makefile index 3cedb28d09..c1b7628a34 100644 --- a/usr/src/boot/sys/boot/libcrypto/Makefile +++ b/usr/src/boot/sys/boot/libcrypto/Makefile @@ -31,6 +31,6 @@ install: all .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/libficl/Makefile b/usr/src/boot/sys/boot/libficl/Makefile index 0f90a50467..97b7bb80f0 100644 --- a/usr/src/boot/sys/boot/libficl/Makefile +++ b/usr/src/boot/sys/boot/libficl/Makefile @@ -30,6 +30,6 @@ $(MACH) $(MACH64): softcore .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/boot/sys/boot/libstand/Makefile b/usr/src/boot/sys/boot/libstand/Makefile index f4ea4e68e6..41e614a3ec 100644 --- a/usr/src/boot/sys/boot/libstand/Makefile +++ b/usr/src/boot/sys/boot/libstand/Makefile @@ -31,6 +31,6 @@ install: all .PARALLEL: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/Adm/Makefile b/usr/src/cmd/Adm/Makefile index dd50d275c1..ea5cb5e530 100644 --- a/usr/src/cmd/Adm/Makefile +++ b/usr/src/cmd/Adm/Makefile @@ -60,7 +60,7 @@ $(CRONTABD)/root := FILEMODE = 0600 all: $(CRON_ENT) $(CRON_LIB) $(ETC_SCRIPT) $(SUBDIRS) install: all $(DIRS) $(CRONTABS) $(CRONLIBS) $(ETCSCRIPTS) $(ETCZONESD) \ - $(SUBDIRS) + $(SUBDIRS) $(CRONTABD)/% : % $(INS.file) @@ -73,7 +73,7 @@ $(ETCZONESD): $(ZI_SPECIAL) $(CHMOD) $(FILEMODE) $(ZISPECIALS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) $(DIRS): $(INS.dir) diff --git a/usr/src/cmd/Makefile.check b/usr/src/cmd/Makefile.check index 91507c9ad9..a5e450b5ea 100644 --- a/usr/src/cmd/Makefile.check +++ b/usr/src/cmd/Makefile.check @@ -159,7 +159,7 @@ check: svccfg_check $(MANIFEST_TOPDIRS) $(MANIFEST_SUBDIRS) $(MISC_SUBDIRS) svccfg_check: @$(ECHO) "building requirements for svccfg check ..."; \ - (cd $(SRC)/cmd/svc/seed && pwd && $(MAKE) $(MFLAGS) global.db) + (cd $(SRC)/cmd/svc/seed && pwd && $(MAKE) global.db) $(MANIFEST_TOPDIRS) $(MANIFEST_SUBDIRS) $(MISC_SUBDIRS): FRC @cd $@; pwd; $(MAKE) check diff --git a/usr/src/cmd/acct/Makefile b/usr/src/cmd/acct/Makefile index 9d0b80f96a..b64e87b8da 100644 --- a/usr/src/cmd/acct/Makefile +++ b/usr/src/cmd/acct/Makefile @@ -146,7 +146,7 @@ $(ETCINITD)/% : % $(INS.file) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/acpi/Makefile b/usr/src/cmd/acpi/Makefile index ce78ff94c0..7fc15b37f2 100644 --- a/usr/src/cmd/acpi/Makefile +++ b/usr/src/cmd/acpi/Makefile @@ -40,6 +40,6 @@ clobber: $(SUBDIRS) lint: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/cmd-crypto/Makefile b/usr/src/cmd/cmd-crypto/Makefile index 6993d7b0d1..ad1ba40573 100644 --- a/usr/src/cmd/cmd-crypto/Makefile +++ b/usr/src/cmd/cmd-crypto/Makefile @@ -49,6 +49,6 @@ all clean clobber _msg: $(SUBDIRS1) $($(MACH)_SUBDIRS) install: $(SUBDIRS1) $(SUBDIRS2) $($(MACH)_SUBDIRS) $(SUBDIRS1) $(SUBDIRS2) $($(MACH)_SUBDIRS) : FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile index ec3c38d215..8e3a8b16a5 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile @@ -170,7 +170,7 @@ $(ROOTREMSHSYMLINK): $(RM) $@; $(SYMLINK) rsh $@ $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/cmd-inet/usr.lib/Makefile b/usr/src/cmd/cmd-inet/usr.lib/Makefile index 9f3c16413e..b2d674bcf1 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/Makefile @@ -56,6 +56,6 @@ install: $(SUBDIRS) _msg: $(MSGSUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile index 2ce08652b7..054a67423d 100644 --- a/usr/src/cmd/fs.d/Makefile +++ b/usr/src/cmd/fs.d/Makefile @@ -203,6 +203,6 @@ clobber_local: clean_local lint: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/fs.d/hsfs/Makefile b/usr/src/cmd/fs.d/hsfs/Makefile index 9b385d404d..cd62f46fad 100644 --- a/usr/src/cmd/fs.d/hsfs/Makefile +++ b/usr/src/cmd/fs.d/hsfs/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # /usr/src/cmd/lib/fs/hsfs is the directory of all ufs specific commands # whose executable reside in $(INSDIR1) and $(INSDIR2). # @@ -49,7 +47,7 @@ POFILES= $(SUBDIR2:%=%/%.po) .PARALLEL: $(SUBDIRS) -all: $(SUBDIRS) +all: $(SUBDIRS) catalog: $(SUBDIR2) $(RM) $(POFILE) @@ -58,6 +56,6 @@ catalog: $(SUBDIR2) install clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/fs.d/pcfs/Makefile b/usr/src/cmd/fs.d/pcfs/Makefile index 9837a2d67d..3abfac78c2 100644 --- a/usr/src/cmd/fs.d/pcfs/Makefile +++ b/usr/src/cmd/fs.d/pcfs/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -53,12 +51,12 @@ all install: $(SUBDIRS) catalog: $(POFILE) $(POFILE): $(SUBDIR2) - $(RM) $@ + $(RM) $@ cat $(POFILES) > $@ clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/fs.d/udfs/Makefile b/usr/src/cmd/fs.d/udfs/Makefile index d6cb3ed343..06e6fc8f40 100644 --- a/usr/src/cmd/fs.d/udfs/Makefile +++ b/usr/src/cmd/fs.d/udfs/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -51,12 +49,12 @@ all install: $(SUBDIRS) catalog: $(POFILE) $(POFILE): $(SUBDIR2) - $(RM) $@ + $(RM) $@ cat $(POFILES) > $@ clean clobber lint putback : $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/fs.d/ufs/Makefile b/usr/src/cmd/fs.d/ufs/Makefile index 6ae7afd332..baafbe60ee 100644 --- a/usr/src/cmd/fs.d/ufs/Makefile +++ b/usr/src/cmd/fs.d/ufs/Makefile @@ -19,7 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -37,7 +36,7 @@ SUBDIR1= clri edquota ff fsck fsckall fsdb fsirand fstyp \ labelit lockfs ncheck quot quota quotacheck quotaon \ repquota tunefs -SUBDIR2= df fssnap mkfs mount newfs volcopy +SUBDIR2= df fssnap mkfs mount newfs volcopy ROLLDIR= roll_log SUBDIRS= $(ROLLDIR) $(SUBDIR1) $(SUBDIR2) @@ -62,12 +61,12 @@ all install: $(ROLLDIR) .WAIT $(SUBDIR1) $(SUBDIR2) catalog: $(POFILE) $(POFILE): $(SUBDIR2) - $(RM) $@ + $(RM) $@ cat $(POFILES) > $@ clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/initpkg/Makefile b/usr/src/cmd/initpkg/Makefile index 4cded71533..490a2fd4ae 100644 --- a/usr/src/cmd/initpkg/Makefile +++ b/usr/src/cmd/initpkg/Makefile @@ -82,10 +82,10 @@ $(ROOTSBINL): $(ROOTSBIN)/rc0 $(RM) $@; $(LN) $(ROOTSBIN)/rc0 $@ all_init.d: FRC - @cd init.d; pwd; $(MAKE) $(MFLAGS) all + @cd init.d; pwd; $(MAKE) all ins_init.d: FRC - @cd init.d; pwd; $(MAKE) $(MFLAGS) install + @cd init.d; pwd; $(MAKE) install $(SHFILES): sh $@.sh $(ROOT) diff --git a/usr/src/cmd/ipf/Makefile b/usr/src/cmd/ipf/Makefile index 953beb9fec..032e6da0c1 100644 --- a/usr/src/cmd/ipf/Makefile +++ b/usr/src/cmd/ipf/Makefile @@ -22,10 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -#cmd/ipf/Makefile -# SUBDIRS= etc examples \ lib svc .WAIT \ @@ -51,7 +47,7 @@ all lint clean clobber: $(SUBDIRS) install: $(SUBDIRS) $(SUBDIRS): FRC - cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/ipf/tools/Makefile b/usr/src/cmd/ipf/tools/Makefile index 03bb135de2..dff05eeb91 100644 --- a/usr/src/cmd/ipf/tools/Makefile +++ b/usr/src/cmd/ipf/tools/Makefile @@ -34,7 +34,7 @@ $(64ONLY)SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) USRLIBIPF= $(ROOTLIB)/ipf -USRLIBIPFLICENCE= $(LICENCE:%=$(USRLIBIPF)/%) +USRLIBIPFLICENCE= $(LICENCE:%=$(USRLIBIPF)/%) FILEMODE= 0755 @@ -61,6 +61,6 @@ install: all $(SUBDIRS) install_local install_local: $(USRLIBIPF) $(USRLIBIPFLICENCE) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/pools/Makefile b/usr/src/cmd/pools/Makefile index b22205e600..066e69aa1f 100644 --- a/usr/src/cmd/pools/Makefile +++ b/usr/src/cmd/pools/Makefile @@ -23,10 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/pools/Makefile -# MANIFEST= pools.xml SVCMETHOD= svc-pools @@ -44,7 +40,7 @@ clobber := TARGET = clobber lint := TARGET = lint _msg := TARGET = _msg -$(ROOTMANIFEST):= FILEMODE= 444 +$(ROOTMANIFEST):= FILEMODE= 444 .KEEP_STATE: @@ -55,6 +51,6 @@ install: $(SUBDIRS) $(ROOTMANIFEST) $(ROOTSVCMETHOD) check: $(CHKMANIFEST) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/stat/Makefile b/usr/src/cmd/stat/Makefile index 8cfd474414..b127c9e697 100644 --- a/usr/src/cmd/stat/Makefile +++ b/usr/src/cmd/stat/Makefile @@ -40,6 +40,6 @@ _msg := TARGET = _msg all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/cmd/svc/Makefile b/usr/src/cmd/svc/Makefile index 43c917f534..56075cebd6 100644 --- a/usr/src/cmd/svc/Makefile +++ b/usr/src/cmd/svc/Makefile @@ -65,7 +65,7 @@ _msg: $(SUBDIR_CMD) startd seed: svccfg configd $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) $(XMLDIR)/%: % $(INS.file) diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 9511b53fab..6a42fa930d 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -108,8 +108,8 @@ clobber := TARGET = clobber all: $(PROG) native: FRC - @cd $(LIBUUTIL)/native; pwd; $(MAKE) $(MFLAGS) install - @NATIVE_BUILD= $(MAKE) $(MFLAGS) all + @cd $(LIBUUTIL)/native; pwd; $(MAKE) install + @NATIVE_BUILD= $(MAKE) all $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/usr/src/cmd/svc/seed/Makefile b/usr/src/cmd/svc/seed/Makefile index 937362605d..561d1cb700 100644 --- a/usr/src/cmd/svc/seed/Makefile +++ b/usr/src/cmd/svc/seed/Makefile @@ -120,13 +120,13 @@ SVCCFG = ../svccfg/svccfg-native all: global.db nonglobal.db miniroot.db $(CONFIGD): FRC - @cd ../configd; pwd; $(MAKE) $(MFLAGS) native + @cd ../configd; pwd; $(MAKE) native $(SVCCFG): FRC - @cd ../svccfg; pwd; $(MAKE) $(MFLAGS) native + @cd ../svccfg; pwd; $(MAKE) native ../milestone/console-login.xml: - @cd ../milestone; pwd; $(MAKE) $(MFLAGS) console-login.xml + @cd ../milestone; pwd; $(MAKE) console-login.xml common.db: $(COMMON_DESCRIPTIONS) $(CONFIGD) $(SVCCFG) $(RM) -f common.db common.db-journal diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index e32c70e8ac..fa97e72508 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -127,9 +127,9 @@ svccfg_help.po := XGETFLAGS = -a all debug: $(PROG) native: FRC - @cd $(LIBUUTIL)/native; pwd; $(MAKE) $(MFLAGS) install - @cd $(LIBSCF)/native; pwd; $(MAKE) $(MFLAGS) install - @NATIVE_BUILD= $(MAKE) $(MFLAGS) all + @cd $(LIBUUTIL)/native; pwd; $(MAKE) install + @cd $(LIBSCF)/native; pwd; $(MAKE) install + @NATIVE_BUILD= $(MAKE) all $(PROG): $(OBJS) $(MAPFILES) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/usr/src/psm/Makefile b/usr/src/psm/Makefile index 0b50db56a7..90b3a14612 100644 --- a/usr/src/psm/Makefile +++ b/usr/src/psm/Makefile @@ -35,6 +35,6 @@ clobber := TARGET = clobber install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/boot/sparcv9/Makefile b/usr/src/psm/stand/boot/sparcv9/Makefile index d980d888af..700f60c819 100644 --- a/usr/src/psm/stand/boot/sparcv9/Makefile +++ b/usr/src/psm/stand/boot/sparcv9/Makefile @@ -43,7 +43,7 @@ all install clean clobber lint: $(SUBDIRS) FRC: $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) cscope.out tags: FRC $(XREF) -x $@ diff --git a/usr/src/psm/stand/bootblks/Makefile b/usr/src/psm/stand/bootblks/Makefile index b900dfb83d..49ca4d43ba 100644 --- a/usr/src/psm/stand/bootblks/Makefile +++ b/usr/src/psm/stand/bootblks/Makefile @@ -19,13 +19,10 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# psm/stand/bootblks/Makefile -# + include ../../../Makefile.master SUBDIRS = ufs hsfs zfs @@ -39,6 +36,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/bootlst/Makefile b/usr/src/psm/stand/bootlst/Makefile index 2505a083b9..8fa6e46b29 100644 --- a/usr/src/psm/stand/bootlst/Makefile +++ b/usr/src/psm/stand/bootlst/Makefile @@ -19,13 +19,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# psm/stand/bootlst/Makefile -# include $(SRC)/Makefile.master sparc_ARCHITECTURES = sparc @@ -44,6 +40,6 @@ all install clean clobber lint clean.lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/bootlst/common/Makefile.com b/usr/src/psm/stand/bootlst/common/Makefile.com index 5c34d3fd52..9717a66b2d 100644 --- a/usr/src/psm/stand/bootlst/common/Makefile.com +++ b/usr/src/psm/stand/bootlst/common/Makefile.com @@ -21,8 +21,6 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# psm/stand/bootlst/common/Makefile.com -# TOPDIR = ../../../../.. @@ -88,7 +86,7 @@ bootlst: $(MAPFILE) $(BOOTLSTOBJ) $(SALIBS) $(POST_PROCESS) $(SALIBS): FRC - @cd $(@D); $(MAKE) $(MFLAGS) + @cd $(@D); $(MAKE) $(ROOTDIR): $(INS.dir) diff --git a/usr/src/psm/stand/cpr/common/Makefile.com b/usr/src/psm/stand/cpr/common/Makefile.com index e129ebafec..a8d25741d9 100644 --- a/usr/src/psm/stand/cpr/common/Makefile.com +++ b/usr/src/psm/stand/cpr/common/Makefile.com @@ -22,8 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# psm/stand/cpr/common/Makefile.com -# + GREP = egrep WC = wc TOPDIR = ../../../../.. @@ -97,7 +96,7 @@ cprboot: $(CPRBOOT_MAPFILE) $(CPRBOOTOBJ) $(SALIBS) $(CHK4UBINARY) $(SALIBS): FRC - @cd $(@D); $(MAKE) $(MFLAGS) + @cd $(@D); $(MAKE) $(ROOTDIR): $(INS.dir) diff --git a/usr/src/psm/stand/lib/Makefile b/usr/src/psm/stand/lib/Makefile index eab3a61f2f..dc91c7acb7 100644 --- a/usr/src/psm/stand/lib/Makefile +++ b/usr/src/psm/stand/lib/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1994 by Sun Microsystems, Inc. # All rights reserved. # -# psm/stand/lib/Makefile include ../../../Makefile.master @@ -40,6 +37,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/boot/Makefile b/usr/src/psm/stand/lib/boot/Makefile index d9872f907f..ade123a0dc 100644 --- a/usr/src/psm/stand/lib/boot/Makefile +++ b/usr/src/psm/stand/lib/boot/Makefile @@ -23,10 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# psm/stand/lib/boot/Makefile - include ../../../../Makefile.master sparcv7_ARCHITECTURES = sparc @@ -44,6 +40,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/boot/sparc/Makefile b/usr/src/psm/stand/lib/boot/sparc/Makefile index 554e9730c6..6a34e169cc 100644 --- a/usr/src/psm/stand/lib/boot/sparc/Makefile +++ b/usr/src/psm/stand/lib/boot/sparc/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 1997, 2001-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# psm/stand/lib/boot/sparc/Makefile include ../../../../../Makefile.master @@ -40,6 +37,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/boot/sparcv9/Makefile b/usr/src/psm/stand/lib/boot/sparcv9/Makefile index f0b2521715..cdb5cef6eb 100644 --- a/usr/src/psm/stand/lib/boot/sparcv9/Makefile +++ b/usr/src/psm/stand/lib/boot/sparcv9/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# psm/stand/lib/boot/sparcv9/Makefile include ../../../../../Makefile.master @@ -40,6 +37,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/names/Makefile b/usr/src/psm/stand/lib/names/Makefile index 0f88fc896e..524cd4b608 100644 --- a/usr/src/psm/stand/lib/names/Makefile +++ b/usr/src/psm/stand/lib/names/Makefile @@ -23,9 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# psm/stand/lib/names/Makefile include ../../../../Makefile.master @@ -43,6 +40,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/names/sparcv9/Makefile b/usr/src/psm/stand/lib/names/sparcv9/Makefile index a0436cb69c..f5ca2c5f5e 100644 --- a/usr/src/psm/stand/lib/names/sparcv9/Makefile +++ b/usr/src/psm/stand/lib/names/sparcv9/Makefile @@ -37,6 +37,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/promif/Makefile b/usr/src/psm/stand/lib/promif/Makefile index 1123c4259c..a677e7c050 100644 --- a/usr/src/psm/stand/lib/promif/Makefile +++ b/usr/src/psm/stand/lib/promif/Makefile @@ -23,10 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# psm/stand/lib/promif/Makefile -# include ../../../../Makefile.master @@ -43,6 +39,6 @@ lint := TARGET = lint all install clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/promif/sparcv9/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/Makefile index 6fd7361218..4da28ca966 100644 --- a/usr/src/psm/stand/lib/promif/sparcv9/Makefile +++ b/usr/src/psm/stand/lib/promif/sparcv9/Makefile @@ -20,14 +20,9 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# # Copyright (c) 1997, by Sun Microsystems, Inc. # All rights reserved. # -# psm/stand/lib/promif/sparcv9/Makefile -# include ../../../../../Makefile.master @@ -42,6 +37,6 @@ lint := TARGET = lint all install clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/Makefile index f45c1a1d21..40bcebf49f 100644 --- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/Makefile +++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/Makefile @@ -37,6 +37,6 @@ lint := TARGET = lint all install clean clobber lint: $(SUBDIRS) $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/stand/Makefile b/usr/src/stand/Makefile index 72b3c3a24f..fc7ade4268 100644 --- a/usr/src/stand/Makefile +++ b/usr/src/stand/Makefile @@ -20,11 +20,8 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1994 by Sun Microsystems, Inc. # -# stand/Makefile include ../Makefile.master @@ -42,6 +39,6 @@ lint := TARGET = lint install := TARGET = install $(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) + @cd $@; pwd; $(MAKE) $(TARGET) FRC: |