diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-28 16:48:56 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-28 16:48:56 +0000 |
| commit | eaacf4700580c612ec50453ad805c8ce122ebcd9 (patch) | |
| tree | b9b8fba308a4099a2e64afd910f2b13a353dc669 /Makefile | |
| parent | d9e75020e386412b317888ae4ff24be970c6efab (diff) | |
make toplevel Makefile pass MAKEFLAGS to out/Makefile
http://codereview.appspot.com/4661052
git-svn-id: http://skia.googlecode.com/svn/trunk@1739 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -54,7 +54,7 @@ clean: %: ./gyp_skia ifneq (,$(findstring Linux, $(uname))) - make -C out $@ BUILDTYPE=$(BUILDTYPE) + $(MAKE) -C out $@ BUILDTYPE=$(BUILDTYPE) endif ifneq (,$(findstring Darwin, $(uname))) xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) @@ -72,7 +72,7 @@ local_filenames := $(shell ls) $(local_filenames):: ./gyp_skia ifneq (,$(findstring Linux, $(uname))) - make -C out $@ BUILDTYPE=$(BUILDTYPE) + $(MAKE) -C out $@ BUILDTYPE=$(BUILDTYPE) endif ifneq (,$(findstring Darwin, $(uname))) xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) |