From 105c11b7f6570292ad0fa15c8346c038f9d2f561 Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Wed, 23 May 2012 12:01:08 -0400
Subject: Clean and DRY up the basic Makefiles

---
 tools/mrbc/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tools/mrbc')

diff --git a/tools/mrbc/Makefile b/tools/mrbc/Makefile
index 9ecda4a59..99f5830e6 100644
--- a/tools/mrbc/Makefile
+++ b/tools/mrbc/Makefile
@@ -23,9 +23,6 @@ LIBS = -lm
 INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
 
 # compiler, linker (gcc)
-CC = gcc
-LL = gcc
-YACC = bison
 DEBUG_MODE = 1
 ifeq ($(DEBUG_MODE),1)
 CFLAGS = -g -O3
@@ -39,6 +36,7 @@ else
   MAKE_FLAGS = CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)'
 endif
 
+
 ##############################
 # generic build targets, rules
 
@@ -63,5 +61,5 @@ $(LIBR) :
 .PHONY : clean
 clean :
 	@echo "make: removing targets, objects and depend files of `pwd`"
-	-rm -f $(EXE) $(OBJS)
-	-rm -f $(OBJS:.o=.d)
+	-$(RM_F) $(EXE) $(OBJS)
+	-$(RM_F) $(OBJS:.o=.d)
-- 
cgit v1.2.3


From 3be28e0b730aa4b241c761ea1eb0084076888796 Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Sun, 27 May 2012 14:44:13 -0400
Subject: Remove unnecessary mrb_init_ext definition

---
 tools/mrbc/mrbc.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'tools/mrbc')

diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index e711b69cb..3553fe646 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -204,11 +204,6 @@ main(int argc, char **argv)
   return n;
 }
 
-void
-mrb_init_ext(mrb_state *mrb)
-{
-}
-
 void
 mrb_init_mrblib(mrb_state *mrb)
 {
-- 
cgit v1.2.3


From 6f4eda74015d30083d406d227f6675302484c9f1 Mon Sep 17 00:00:00 2001
From: Jon <jon.forums@gmail.com>
Date: Sun, 27 May 2012 20:27:11 -0400
Subject: Simplify CMake mruby object library

Also removes an unnecessary build target from the CMake generated
build and project files.
---
 src/CMakeLists.txt        | 1 -
 tools/mrbc/CMakeLists.txt | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'tools/mrbc')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 390129eb9..4a6aeee2c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,5 @@ file(GLOB MRUBY_SRC_C "*.c")
 list(APPEND MRUBY_SRC_C "${CMAKE_CURRENT_BINARY_DIR}/parse.c")
 
 add_library(mruby_object OBJECT ${MRUBY_SRC_C} ${BISON_mruby_OUTPUTS})
-add_library(mruby_static STATIC EXCLUDE_FROM_ALL $<TARGET_OBJECTS:mruby_object>)
 
 # vim: ts=2 sts=2 sw=2 et
diff --git a/tools/mrbc/CMakeLists.txt b/tools/mrbc/CMakeLists.txt
index 71a3a937d..043b7dc83 100644
--- a/tools/mrbc/CMakeLists.txt
+++ b/tools/mrbc/CMakeLists.txt
@@ -1,8 +1,8 @@
 # build tools/mrbc executable
 
 file(GLOB MRBC_SRC_C "*.c")
-add_executable(mrbc ${MRBC_SRC_C})
-target_link_libraries(mrbc mruby_static ${MRUBY_LIBS})
+add_executable(mrbc ${MRBC_SRC_C} $<TARGET_OBJECTS:mruby_object>)
+target_link_libraries(mrbc ${MRUBY_LIBS})
 
 install(TARGETS mrbc RUNTIME DESTINATION bin)
 
-- 
cgit v1.2.3