commit d34c0e119ee18108d0da853ff94a409c1383fa20
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jun 04 16:53:47 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jun 04 16:53:47 2015 +0900
tree c98490ec69c43e41565b99267267ab979892a345
parent 5fb52573908e24edcf69a9209611a05f803e9c10

Add --goma flag

eval.go

diff --git a/eval.go b/eval.go
index 8a521d3..0b620e8 100644
--- a/eval.go
+++ b/eval.go
@@ -332,7 +332,7 @@
 	}
 
 	for _, fn := range files {
-		if ignoreOptionalInclude != "" && ast.op == "-include" && strings.HasPrefix(fn, ignoreOptionalInclude) {
+		if ignoreOptionalInclude != "" && ast.op == "-include" && matchPattern(fn, ignoreOptionalInclude) {
 			continue
 		}
 		c, err := ioutil.ReadFile(fn)

m2n

diff --git a/m2n b/m2n
index 3951c3c..80692ba 100755
--- a/m2n
+++ b/m2n
@@ -14,6 +14,7 @@
     cat - <<EOF
 Usage:
   m2n         # for full-build
+  m2n --goma  # use goma. \$HOME/goma must exist
   m2n bionic  # works like mmm
 EOF
     exit 1
@@ -39,6 +40,6 @@
   echo ONE_SHOT_MAKEFILE=${ONE_SHOT_MAKEFILE}
 fi
 
-${kati} --ninja --ignore_optional_include=out/ ${goma_flag}
+${kati} --ninja --ignore_optional_include=out/%.P ${goma_flag}
 
 echo ninja.sh and build.ninja were generated, please run ./ninja.sh