commit eaacf4700580c612ec50453ad805c8ce122ebcd9
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 28 16:48:56 2011 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 28 16:48:56 2011 +0000
tree b9b8fba308a4099a2e64afd910f2b13a353dc669
parent d9e75020e386412b317888ae4ff24be970c6efab

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

Makefile

diff --git a/Makefile b/Makefile
index 037836a..e4e9a10 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@
 %:
 	./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)::
 	./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)