diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-17 12:13:24 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-17 12:13:24 +0900 |
| commit | 3e3a8c18b941c4c6518e59a39c6cb5a6b36fd452 (patch) | |
| tree | e68b59e29b6f2ae3078eaac1b61c1666be4a0856 | |
| parent | 74e531ecabe07bfe987e32ff52d2239810d74617 (diff) | |
| download | mruby-3e3a8c18b941c4c6518e59a39c6cb5a6b36fd452.tar.gz mruby-3e3a8c18b941c4c6518e59a39c6cb5a6b36fd452.zip | |
avoid updating existing libmruby.a to avoid problems on low time resolution file systems; close #136
| -rw-r--r-- | mrblib/Makefile | 3 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | tools/mrbc/Makefile | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mrblib/Makefile b/mrblib/Makefile index 712962371..f56d00b5a 100644 --- a/mrblib/Makefile +++ b/mrblib/Makefile @@ -12,6 +12,7 @@ RLIB := $(TARGET).rbtmp DEPLIB := $(TARGET).d MRB1 := $(BASEDIR)/*.rb MRBS := $(MRB1) +LIBR0 := ../lib/libmruby_core.a LIBR := ../lib/libmruby.a # C compiler (gcc) @@ -47,6 +48,7 @@ all : $(LIBR) # update libmruby.a $(LIBR) : $(MLIB) + cp $(LIBR0) $(LIBR) $(AR) r $(LIBR) $(MLIB) # Compile mrblib source @@ -69,4 +71,3 @@ $(RLIB) : $(MRBS) clean : @echo "make: removing targets, objects and depend files of `pwd`" -rm -f $(MRBC) $(MLIB) $(CLIB) $(RLIB) $(DLIB) $(DEPLIB) - diff --git a/src/Makefile b/src/Makefile index 3fbcd25f5..14485041d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # project-specific macros # extension of the executable-file is modifiable(.exe .out ...) BASEDIR = . -TARGET := ../lib/libmruby.a +TARGET := ../lib/libmruby_core.a YSRC := $(BASEDIR)/parse.y YC := $(BASEDIR)/y.tab.c EXCEPT1 := $(YC) $(BASEDIR)/minimain.c diff --git a/tools/mrbc/Makefile b/tools/mrbc/Makefile index 1440f0e4d..9ecda4a59 100644 --- a/tools/mrbc/Makefile +++ b/tools/mrbc/Makefile @@ -5,7 +5,7 @@ # extension of the executable-file is modifiable(.exe .out ...) BASEDIR := ../../src TARGET := ../../bin/mrbc -LIBR := ../../lib/libmruby.a +LIBR := ../../lib/libmruby_core.a ifeq ($(OS),Windows_NT) EXE := $(TARGET).exe else |