Merge pull request #216 from cgjones/local-mk

allow custom rules to be defined in local.mk
This commit is contained in:
Rob Sayre 2011-07-07 09:57:30 -07:00
commit 155fea4eaa
2 changed files with 6 additions and 1 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
*~
pdf.pdf
intelisa.pdf
openweb_tm-PRINT.pdf
local.mk

View File

@ -3,6 +3,9 @@ BUILD_DIR := build
DEFAULT_BROWSERS := test/resources/browser_manifests/browser_manifest.json
DEFAULT_TESTS := test/test_manifest.json
# Let folks define custom rules for their clones.
-include local.mk
# JS files needed for pdf.js.
# This list doesn't account for the 'worker' directory.
PDF_JS_FILES = \
@ -156,5 +159,5 @@ clean:
help:
@echo "Read the comments in the Makefile for guidance.";
.PHONY: all test browser-test font-test shell-test \
.PHONY:: all test browser-test font-test shell-test \
shell-msg lint clean web compiler help server