summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorsnaba <[email protected]>2012-04-23 09:42:29 +0900
committersnaba <[email protected]>2012-04-23 09:42:29 +0900
commit1f87caa2c76bc3b522455b400ab1ff362bfeaa15 (patch)
tree713cf17746e245aa03af0d86c8f62bd5b983bebd /tools
parent210fcdc14b7531e2888e9ebb67d2c77b9f5302c0 (diff)
parentcf6e7966d3de0de1cf03e8c72dbde474d61d9f7d (diff)
downloadmruby-1f87caa2c76bc3b522455b400ab1ff362bfeaa15.tar.gz
mruby-1f87caa2c76bc3b522455b400ab1ff362bfeaa15.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'tools')
-rw-r--r--tools/mrbc/Makefile1
-rw-r--r--tools/mruby/Makefile1
-rw-r--r--tools/mruby/mruby.c6
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/mrbc/Makefile b/tools/mrbc/Makefile
index ba7764b78..7271a2fed 100644
--- a/tools/mrbc/Makefile
+++ b/tools/mrbc/Makefile
@@ -69,5 +69,6 @@ $(YC) : $(YSRC)
clean :
-rm -f $(EXE) $(OBJS) $(OBJY) $(YC)
-rm -f $(OBJS:.o=.d) $(OBJY:.o=.d)
+ -rm -f $(patsubst %.c,%.o,$(EXCEPT1)) $(patsubst %.c,%.d,$(EXCEPT1))
@echo "make: removing targets, objects and depend files of `pwd`"
diff --git a/tools/mruby/Makefile b/tools/mruby/Makefile
index dfb8b7f7c..62d7cdd3f 100644
--- a/tools/mruby/Makefile
+++ b/tools/mruby/Makefile
@@ -86,4 +86,5 @@ clean :
$(MAKE) clean -C ../../mrblib $(MAKE_FLAGS)
-rm -f $(EXE) $(OBJS) $(OBJY) $(YC) $(EXTS)
-rm -f $(OBJS:.o=.d) $(OBJY:.o=.d) $(EXTS:.o=.d)
+ -rm -f $(patsubst %.c,%.o,$(EXCEPT1)) $(patsubst %.c,%.d,$(EXCEPT1))
@echo "make: removing targets, objects and depend files of `pwd`"
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 4e84b3c7d..769746530 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -22,10 +22,10 @@ usage(const char *name)
{
static const char *const usage_msg[] = {
"switches:",
- "-b load and execute RiteBinary(mrb) file",
+ "-b load and execute RiteBinary (mrb) file",
"-c check syntax only",
- "-v print version number, then trun on verbose mode",
- "--verbose run at verbose mode",
+ "-v print version number, then run in verbose mode",
+ "--verbose run in verbose mode",
"--version print the version",
"--copyright print the copyright",
NULL