diff options
| author | Chris Fraire <cfraire@me.com> | 2016-09-13 11:21:55 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-08-22 19:36:57 -0400 |
| commit | 89d58ee09d14e0fcdb6f3e8b43197b24ba7a0036 (patch) | |
| tree | 23bd0f5f11b497dfe9b3749878682a594ef35331 /usr/src | |
| parent | 1702cce751c5cb7ead878d0205a6c90b027e3de8 (diff) | |
| download | illumos-joyent-89d58ee09d14e0fcdb6f3e8b43197b24ba7a0036.tar.gz | |
8523 Fix "clobber" in a few Makefiles
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libdisasm/Makefile.targ | 9 | ||||
| -rw-r--r-- | usr/src/lib/libsaveargs/Makefile.targ | 9 | ||||
| -rw-r--r-- | usr/src/lib/libumem/Makefile.targ | 9 | ||||
| -rw-r--r-- | usr/src/tools/Makefile | 7 |
4 files changed, 20 insertions, 14 deletions
diff --git a/usr/src/lib/libdisasm/Makefile.targ b/usr/src/lib/libdisasm/Makefile.targ index e9f2c11268..cdd938135f 100644 --- a/usr/src/lib/libdisasm/Makefile.targ +++ b/usr/src/lib/libdisasm/Makefile.targ @@ -21,6 +21,7 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright (c) 2016, Chris Fraire <cfraire@me.com>. # # @@ -35,10 +36,10 @@ install: $(TYPES:%=install.%) all: $(TYPES:%=all.%) $(TYPES:%=all.%): - @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ + @$(MAKE) $@.targ CURTYPE=$(@:all.%=%) $(TYPES:%=install.%): - @CURTYPE=$(@:install.%=%) $(MAKE) $@.targ + @$(MAKE) $@.targ CURTYPE=$(@:install.%=%) install.library.targ: all.library $(INSTALL_DEPS_library) install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone) @@ -49,7 +50,7 @@ all.standalone.targ: $(STANDLIBRARY) lint: $(TYPES:%=lint.%) $(TYPES:%=lint.%): - @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck + @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) @@ -59,7 +60,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) clobber: $(TYPES:%=clobber.%) $(TYPES:%=clobber.%): - @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ + @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%) clobber.targ: clean -$(RM) $(CLOBBERTARGFILES) diff --git a/usr/src/lib/libsaveargs/Makefile.targ b/usr/src/lib/libsaveargs/Makefile.targ index fac60a013e..f90deed1db 100644 --- a/usr/src/lib/libsaveargs/Makefile.targ +++ b/usr/src/lib/libsaveargs/Makefile.targ @@ -21,6 +21,7 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright (c) 2016, Chris Fraire <cfraire@me.com>. # # @@ -35,10 +36,10 @@ install: $(TYPES:%=install.%) all: $(TYPES:%=all.%) $(TYPES:%=all.%): - @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ + @$(MAKE) $@.targ CURTYPE=$(@:all.%=%) $(TYPES:%=install.%): - @CURTYPE=$(@:install.%=%) $(MAKE) $@.targ + @$(MAKE) $@.targ CURTYPE=$(@:install.%=%) install.library.targ: all.library $(INSTALL_DEPS_library) install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone) @@ -49,7 +50,7 @@ all.standalone.targ: $(STANDLIBRARY) lint: $(TYPES:%=lint.%) $(TYPES:%=lint.%): - @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck + @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) @@ -59,7 +60,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) clobber: $(TYPES:%=clobber.%) $(TYPES:%=clobber.%): - @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ + @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%) clobber.targ: clean -$(RM) $(CLOBBERTARGFILES) diff --git a/usr/src/lib/libumem/Makefile.targ b/usr/src/lib/libumem/Makefile.targ index 1e5cad3062..c56b5fd9f5 100644 --- a/usr/src/lib/libumem/Makefile.targ +++ b/usr/src/lib/libumem/Makefile.targ @@ -21,8 +21,7 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2016, Chris Fraire <cfraire@me.com>. # # @@ -40,7 +39,7 @@ install.standalone: all.standalone $(INSTALL_DEPS_standalone) all: $(TYPES:%=all.%) $(TYPES:%=all.%): - @CURTYPE=$(@:all.%=%) $(MAKE) $@.targ + @$(MAKE) $@.targ CURTYPE=$(@:all.%=%) all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) @@ -48,7 +47,7 @@ all.standalone.targ: $(STANDLIBRARY) lint: $(TYPES:%=lint.%) $(TYPES:%=lint.%): - @CURTYPE=$(@:lint.%=%) $(MAKE) lintcheck + @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) @@ -58,7 +57,7 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) clobber: $(TYPES:%=clobber.%) $(TYPES:%=clobber.%): - @CURTYPE=$(@:clobber.%=%) $(MAKE) clobber.targ + @$(MAKE) clobber.targ CURTYPE=$(@:clobber.%=%) clobber.targ: clean -$(RM) $(CLOBBERTARGFILES) diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index 2f02192e1e..72f01a8ef0 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -23,6 +23,7 @@ # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016 Toomas Soome <tsoome@me.com> +# Copyright (c) 2016, Chris Fraire <cfraire@me.com>. # include ../Makefile.master @@ -128,6 +129,10 @@ DOROOTDIRS= $(ROOTDIRS) clobber:= DOROOTDIRS= clean:= DOROOTDIRS= +DOROOTONBLDLIBPY= $(ROOTONBLDLIBPY) +clobber:= DOROOTONBLDLIBPY= +clean:= DOROOTONBLDLIBPY= + all install: $(SUBDIRS) clean: $(SUBDIRS) @@ -143,7 +148,7 @@ _msg: $(MSGSUBDIRS) $(SUBDIRS) $(CLOSED_SUBDIRS): $(BOOT_SUBDIRS) -$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $(ROOTONBLDLIBPY) FRC +$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $$(DOROOTONBLDLIBPY) FRC @cd $@; pwd; $(MAKE) $(TARGET) $(ROOTDIRS): |