Changeset 232 for soft/giet_vm/Makefile

Timestamp:

Mar 5, 2013, 4:00:09 PM (12 years ago)

Author:

meunier

Message:

Ajout du malloc dans le Giet.

File:

• soft/giet_vm/Makefile (modified) (4 diffs)

soft/giet_vm/Makefile

@@ -1 +1 @@
 export # export all variable to sub-Makefile
-CC=mipsel-unknown-elf-gcc
-AS=mipsel-unknown-elf-as
-LD=mipsel-unknown-elf-ld
-DU=mipsel-unknown-elf-objdump
+CC = mipsel-unknown-elf-gcc
+AS = mipsel-unknown-elf-as
+LD = mipsel-unknown-elf-ld
+DU = mipsel-unknown-elf-objdump
 
 MAP_XML      = mappings/4c_1p_four.xml
 
 SYS_OBJS     = build/sys/vm_handler.o \
-                       build/sys/sys_handler.o \
+               build/sys/sys_handler.o \
                build/sys/giet.o \
-               build/sys/switch.o \
+               build/sys/switch.o \
                build/sys/common.o \
                build/sys/ctx_handler.o \
@@ -38 +38 @@
                build/libs/utils.o
 
-CFLAGS=-Wall -ffreestanding -mno-gpopt -mips32 -g
+CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32 -g
 
 INCLUDE = -Iboot -Isys -Ixml -Ilibs -I.
 
-TRASH= /dev/null||true
+all: map.bin soft.elf
 
-all: map.bin soft.elf
-        
 ## merge all *.elf and map.bin to soft.elf
 soft.elf: build/boot/boot.elf \
@@ -107 +105 @@
 
 build/hello/main.o: hello/main.c
-        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
+        $(CC) $(INCLUDE) $(CFLAGS) -c -o $@ $<
 
 ### pgcd compilation
@@ -115 +113 @@
 
 build/pgcd/main.o: pgcd/main.c
-        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
+        $(CC) $(INCLUDE) $(CFLAGS) -c -o $@ $<
 
 ### libs compilation
 build/libs/utils.o: libs/utils.c giet_config.h
-        $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
+        $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
 
 build/libs/stdio.o: libs/stdio.c giet_config.h  
-        $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
+        $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
 
 build/libs/mwmr_channel.o: libs/mwmr_channel.c
-        $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
+        $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
+
+build/libs/malloc.o: libs/malloc.c libs/malloc.h libs/malloc_private.h giet_config.h
+        $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
+
 
 
 ### clean 
 clean:
-        rm -f *.o *.elf *.bin *.txt core  giet_vsegs.ld hard_config.h *~ 2>$(TRASH)
-        $(MAKE) -s clean -C xml 2>$(TRASH)
-        $(MAKE) -s clean -C memo 2>$(TRASH)
-        rm -r build/boot/* 2>$(TRASH)
-        rm -r build/sys/* 2>$(TRASH)
-        rm -r build/libs/* 2>$(TRASH)
-        rm -r build/pgcd/* 2>$(TRASH)
-        rm -r build/hello/* 2>$(TRASH)
-        rm -r build/display/* 2>$(TRASH)
-        rm -r build/router/* 2>$(TRASH)
+        rm -f *.o *.elf *.bin *.txt core  giet_vsegs.ld hard_config.h *~
+        $(MAKE) -s clean -C xml
+        $(MAKE) -s clean -C memo
+        rm -rf build/boot/*
+        rm -rf build/sys/*
+        rm -rf build/libs/*
+        rm -rf build/pgcd/*
+        rm -rf build/hello/*
+        rm -rf build/display/*
+        rm -rf build/router/*