From ac235e25e54c55784b175cf9e66b8db89a54bd44 Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Mon, 17 Sep 2012 10:23:51 +0900 Subject: [PATCH] Relocate files --- mrbgems/Makefile | 22 ++++++++++++---------- mrbgems/{ => g}/md5/Makefile | 2 +- mrbgems/{ => g}/md5/README.md | 0 mrbgems/{ => g}/md5/src/md5.c | 0 mrbgems/{ => g}/md5/src/md5.h | 0 mrbgems/{ => g}/md5/src/mrb_md5.c | 0 mrbgems/{ => g}/md5/src/mrb_md5.h | 0 7 files changed, 13 insertions(+), 11 deletions(-) rename mrbgems/{ => g}/md5/Makefile (93%) rename mrbgems/{ => g}/md5/README.md (100%) rename mrbgems/{ => g}/md5/src/md5.c (100%) rename mrbgems/{ => g}/md5/src/md5.h (100%) rename mrbgems/{ => g}/md5/src/mrb_md5.c (100%) rename mrbgems/{ => g}/md5/src/mrb_md5.h (100%) diff --git a/mrbgems/Makefile b/mrbgems/Makefile index 368488926..b8f35f2a9 100644 --- a/mrbgems/Makefile +++ b/mrbgems/Makefile @@ -5,22 +5,24 @@ LIBRGEMS := ../lib/libmruby_gems.a INIT := init_gems RM_F := rm -f CC_FLAGS := -Wall -Werror-implicit-function-declaration -g -O3 -MMD -I. -I./../include +GEM_DIRS := $(wildcard g/*) ############################## # generic build targets, rules .PHONY : all -all : $(INIT).o +all : $(GEM_DIRS) + echo $(GEM_DIRS) -# @TODO: -# all available GEMS have to be built -$(INIT).o : $(INIT).c - gcc $(CC_FLAGS) -c $(INIT).c -o $(INIT).o - @$(MAKE) -C md5 +# driver build rule +#$(INIT).o : $(INIT).c +# gcc $(CC_FLAGS) -c $(INIT).c -o $(INIT).o -# @TODO: -# all available GEMS have to be cleaned +$(GEM_DIRS) : + echo $@ + +# clean driver and all gems .PHONY : clean -clean : +clean : g/* $(RM_F) $(INIT).o $(INIT).d $(LIBRGEMS) - @$(MAKE) clean -C md5 + $(MAKE) clean -C $< diff --git a/mrbgems/md5/Makefile b/mrbgems/g/md5/Makefile similarity index 93% rename from mrbgems/md5/Makefile rename to mrbgems/g/md5/Makefile index 5ea2597c6..a4457c9a6 100644 --- a/mrbgems/md5/Makefile +++ b/mrbgems/g/md5/Makefile @@ -1,4 +1,4 @@ -MRUBY_ROOT = ../.. +MRUBY_ROOT = ../../.. INCLUDES = -I$(MRUBY_ROOT)/include -I$(MRUBY_ROOT)/src -I. CFLAGS = $(INCLUDES) -O3 -g -Wall -Werror-implicit-function-declaration diff --git a/mrbgems/md5/README.md b/mrbgems/g/md5/README.md similarity index 100% rename from mrbgems/md5/README.md rename to mrbgems/g/md5/README.md diff --git a/mrbgems/md5/src/md5.c b/mrbgems/g/md5/src/md5.c similarity index 100% rename from mrbgems/md5/src/md5.c rename to mrbgems/g/md5/src/md5.c diff --git a/mrbgems/md5/src/md5.h b/mrbgems/g/md5/src/md5.h similarity index 100% rename from mrbgems/md5/src/md5.h rename to mrbgems/g/md5/src/md5.h diff --git a/mrbgems/md5/src/mrb_md5.c b/mrbgems/g/md5/src/mrb_md5.c similarity index 100% rename from mrbgems/md5/src/mrb_md5.c rename to mrbgems/g/md5/src/mrb_md5.c diff --git a/mrbgems/md5/src/mrb_md5.h b/mrbgems/g/md5/src/mrb_md5.h similarity index 100% rename from mrbgems/md5/src/mrb_md5.h rename to mrbgems/g/md5/src/mrb_md5.h