Merge 'make stackwalker' into bootstrap script.

fix bug 1038358

Makefile

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-.PHONY: all test bootstrap install lint clean breakpad stackwalker json_enhancements_pg_extension
+.PHONY: all test bootstrap install lint clean breakpad json_enhancements_pg_extension
 
 all: test
 
@@ -26,9 +26,3 @@ breakpad:
 
 json_enhancements_pg_extension: bootstrap
 	bash ./scripts/json-enhancements.sh
-
-stackwalker:
-	# Build JSON stackwalker
-	# Depends on breakpad, run "make breakpad" if you don't have it yet
-	cd minidump-stackwalk; make
-	cp minidump-stackwalk/stackwalker stackwalk/bin

scripts/bootstrap.sh

@@ -21,7 +21,12 @@ ${VIRTUAL_ENV}/bin/peep install --download-cache=./pip-cache -r requirements.txt
 wget --quiet 'https://ci.mozilla.org/job/breakpad/lastSuccessfulBuild/artifact/breakpad.tar.gz'
 tar -zxf breakpad.tar.gz
 mv breakpad stackwalk
-make stackwalker
+# Build JSON stackwalker
+# Depends on breakpad, run "make breakpad" if you don't have it yet
+pushd minidump-stackwalk
+make
+popd
+cp minidump-stackwalk/stackwalker stackwalk/bin
 
 # bootstrap webapp
 pushd webapp-django