Usermode/libc #6 Fix string.h functions, add some more unit tests

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / Makefile

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index fd186a9..64749b3 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -1,46 +1,38 @@
-# AcessOS Basic C Library\r
+# Acess2 Basic C Library\r
 # Makefile\r
 \r
-CC = gcc\r
-AS = nasm\r
-RM = @rm -f\r
-LD = ld\r
-OBJDUMP = objdump\r
-ACESSDIR = /home/hodgeja/Projects/Acess2\r
-\r
-CPPFLAGS = -I$(ACESSDIR)/Usermode/include\r
-CFLAGS = -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)\r
-ASFLAGS = -felf\r
-LDFLAGS = -x -shared -soname libc.so.1 -Map map.txt -e SoMain -L$(ACESSDIR)/Usermode/Libraries -lacess\r
-\r
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o signals.o string.o\r
-BIN = ../libc.so.1\r
-\r
-.PHONY:        all clean\r
-\r
-all: $(BIN) $(OBJ_LIBC)\r
-\r
-clean:\r
-       $(RM) $(BIN) $(OBJ_LIBC)\r
-\r
-# Core C Library\r
-$(BIN): $(OBJ_LIBC)\r
-       @echo --- ld -shared -o $@\r
-       @$(LD) $(LDFLAGS) $(OBJ_LIBC) -o $@\r
-       $(OBJDUMP) -d $@ > libc.so.1.dsm\r
-       $(OBJDUMP) -x -r -R $@ > libc.so.1.dmp\r
-       cp ../libc.so.1 ../libc.so\r
-       cp ../libc.so.1 /mnt/AcessHDD/Acess2/Libs/\r
-\r
-# C Runtime 0\r
-../crt0.o: crt0.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r
-\r
-$(filter %.o, $(OBJ_LIBC)): %.o: %.c config.h\r
-       @echo --- $(CC) -o $@\r
-       @$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<\r
-\r
-$(filter %.ao, $(OBJ_LIBC)): %.ao: %.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r
+-include ../Makefile.cfg\r
+\r
+CPPFLAGS += \r
+CFLAGS   += -nostdlib -Wall -Werror -Wextra\r
+ASFLAGS  +=\r
+LDFLAGS  += -nostdlib\r
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)\r
+LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)\r
+\r
+INCFILES := stdio.h stdlib.h\r
+\r
+OBJ  = stub.o heap.o stdlib.o env.o string.o rand.o\r
+OBJ += scanf.o signals.o strtoi.o strtof.o \r
+OBJ += printf.o time.o timeconv.o errno.o ctype.o\r
+OBJ += stdio.o stdio_files.o\r
+OBJ += arch/$(ARCHDIR).ao\r
+# signals.o\r
+DEPFILES := $(OBJ:%.o=%.d)\r
+BIN = libc.so\r
+ifeq ($(ARCHDIR),native)\r
+ OBJ := $(filter-out heap.o,$(OBJ)) heap_native.o\r
+ #LDFLAGS += -l c\r
+ BIN = libc_acess.so\r
+endif\r
+\r
+include ../Makefile.tpl\r
+\r
+EXP_%.txt: TEST_%.native\r
+       @./$< > $@\r
+       @rm $<\r
+EXP_strtoi.txt:\r
+       echo -n "" > $@\r
+\r
+%.native: %.c\r
+       $(NCC) $< -o $@ -Wall -std=gnu99\r