diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-03 23:42:38 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-03 23:42:38 +0900 |
| commit | f3599bb4423790b674b33ec340433a234965058a (patch) | |
| tree | fcbf3c9a02b8eb42dfa1b68ce1a66aa930ec14fe | |
| parent | 050cb3d70ec6bad9e1366cd69ed7273397b5b840 (diff) | |
| download | mruby-f3599bb4423790b674b33ec340433a234965058a.tar.gz mruby-f3599bb4423790b674b33ec340433a234965058a.zip | |
library file name renamed to libmruby.a on all platforms
| -rw-r--r-- | mrblib/Makefile | 7 | ||||
| -rw-r--r-- | src/Makefile | 13 | ||||
| -rw-r--r-- | tools/mrbc/Makefile | 4 | ||||
| -rw-r--r-- | tools/mruby/Makefile | 4 |
4 files changed, 7 insertions, 21 deletions
diff --git a/mrblib/Makefile b/mrblib/Makefile index 10cf654cd..1fd0eb5a7 100644 --- a/mrblib/Makefile +++ b/mrblib/Makefile @@ -12,12 +12,7 @@ RLIB := $(TARGET).rbtmp DEPLIB := $(TARGET).d MRB1 := $(BASEDIR)/*.rb MRBS := $(MRB1) -LIB := ../lib/mruby -ifeq ($(OS),Windows_NT) -LIBR := $(LIB).lib -else -LIBR := $(LIB).a -endif +LIBR := ../lib/libmruby.a # C compiler (gcc) CC = gcc diff --git a/src/Makefile b/src/Makefile index 1b139389a..11a00b41c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,12 +4,7 @@ # project-specific macros # extension of the executable-file is modifiable(.exe .out ...) BASEDIR = . -TARGET := ../lib/mruby -ifeq ($(OS),Windows_NT) -LIB := $(TARGET).lib -else -LIB := $(TARGET).a -endif +TARGET := ../lib/libmruby.a YSRC := $(BASEDIR)/parse.y YC := $(BASEDIR)/y.tab.c EXCEPT1 := $(YC) $(BASEDIR)/minimain.c @@ -40,11 +35,11 @@ ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) # generic build targets, rules .PHONY : all -all : $(LIB) +all : $(TARGET) @echo "make: built targets of `pwd`" # executable constructed using linker from object files -$(LIB) : $(OBJS) $(OBJY) +$(TARGET) : $(OBJS) $(OBJY) $(AR) r $@ $(OBJS) $(OBJY) -include $(OBJS:.o=.d) $(OBJY:.o=.d) @@ -65,6 +60,6 @@ $(YC) : $(YSRC) .PHONY : clean #cleandep clean : @echo "make: removing targets, objects and depend files of `pwd`" - -rm -f $(LIB) $(OBJS) $(OBJY) $(YC) + -rm -f $(TARGET) $(OBJS) $(OBJY) $(YC) -rm -f $(OBJS:.o=.d) $(OBJY:.o=.d) -rm -f $(patsubst %.c,%.o,$(EXCEPT1)) $(patsubst %.c,%.d,$(EXCEPT1)) diff --git a/tools/mrbc/Makefile b/tools/mrbc/Makefile index 282032c76..1137baa03 100644 --- a/tools/mrbc/Makefile +++ b/tools/mrbc/Makefile @@ -5,13 +5,11 @@ # extension of the executable-file is modifiable(.exe .out ...) BASEDIR := ../../src TARGET := ../../bin/mrbc -LIB := ../../lib/mruby +LIBR := ../../lib/libmruby.a ifeq ($(OS),Windows_NT) EXE := $(TARGET).exe -LIBR := $(LIB).lib else EXE := $(TARGET) -LIBR := $(LIB).a endif EXCEPT1 := OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mrbc/*.c)) diff --git a/tools/mruby/Makefile b/tools/mruby/Makefile index 7b7eb83be..19140aabb 100644 --- a/tools/mruby/Makefile +++ b/tools/mruby/Makefile @@ -5,13 +5,11 @@ # extension of the executable-file is modifiable(.exe .out ...) BASEDIR = ../../src TARGET := ../../bin/mruby -LIB := ../../lib/mruby +LIBR := ../../lib/libmruby.a ifeq ($(OS),Windows_NT) EXE := $(TARGET).exe -LIBR := $(LIB).lib else EXE := $(TARGET) -LIBR := $(LIB).a endif OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mruby/*.c)) #OBJ1 := $(patsubst %.c,%.o,$(filter-out $(EXCEPT1),$(wildcard $(BASEDIR)/*.c))) |