Using a cross-compiler. Better makefile system.

3 files changed, 11 insertions, 35 deletions

diff --git a/src/library/Makefile b/src/library/Makefile
index 3d55354..ac585f5 100644
--- a/src/library/Makefile
+++ b/src/library/Makefile
@@ -1,37 +1,13 @@
-.PHONY: clean, mrproper
+Out = grapes.o
+Obj = gc/syscall.o gc/server.o \
+	  gm/call.o gm/call/manager.o \
+	  gc/mem.o gc/shm.o \
+	  std/mutex.o std/string.o std/stdio.o \
+	  start.o
 
-CC = gcc
-CFLAGS = -nostdlib -nostartfiles -nodefaultlibs -fno-builtin -fno-stack-protector -Wall -Wextra -I../include
+include ../common.make
 
-LD = ld
-LDFLAGS = -r
+CFLAGS =  -I../include
 
-Library = grapes.o
-Objects = gc/syscall.o gc/server.o \
-		  gm/call.o gm/call/manager.o \
-		  gc/mem.o gc/shm.o \
-		  std/mutex.o std/string.o std/stdio.o \
-		  start.o
+LDFLAGS += -r
 
-all: $(Library)
-	echo "* Done with library $(Library)"
-
-rebuild: mrproper all
-
-$(Library): $(Objects)
-	echo "* Linking library $(Library)..."
-	$(LD) $(LDFLAGS) $^ -o $@
-
-%.uo: %.c
-	echo "* Compiling $<..."
-	$(CC) $(CFLAGS) -c $< -o $@
-
-clean:
-	echo "* Removing object files..."
-	rm *.o || exit 0
-	rm -rf $(Objects) || exit 0
-
-mrproper: clean
-	echo "* Removing library..."
-	rm *.o || exit 0
-	rm -rf $(Library) || exit 0
diff --git a/src/library/gm/call.c b/src/library/gm/call.c
index 553fbaf..c897415 100644
--- a/src/library/gm/call.c
+++ b/src/library/gm/call.c
@@ -1,4 +1,4 @@
-#include <syscall.h>
+#include <gc/syscall.h>
 #include <gm/call.h>
 #include <gm/method.h>
 #include <gc/shm.h>
diff --git a/src/library/gm/call/manager.c b/src/library/gm/call/manager.c
index 4b296f7..f4cef90 100644
--- a/src/library/gm/call/manager.c
+++ b/src/library/gm/call/manager.c
@@ -1,4 +1,4 @@
-#include <syscall.h>
+#include <gc/syscall.h>
 #include <gm/call/manager.h>
 #include <gm/method.h>
 #include <gc/shm.h>