Permalink
Browse files

avoid updating existing libmruby.a to avoid problems on low time reso…

…lution file systems; close #136
  • Loading branch information...
1 parent 74e531e commit 3e3a8c18b941c4c6518e59a39c6cb5a6b36fd452 @matz matz committed May 17, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −1 mrblib/Makefile
  2. +1 −1 src/Makefile
  3. +1 −1 tools/mrbc/Makefile
View
@@ -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)
-
View
@@ -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
View
@@ -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

0 comments on commit 3e3a8c1

Please sign in to comment.