library file name renamed to libmruby.a on all platforms

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

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))

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))

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)))