Usermode/libc - C++ wrapping in headers, time rework

[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 7b34587..3c18c28 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -11,8 +11,8 @@ LDFLAGS  += -Map map.txt
 INCFILES := stdio.h stdlib.h\r
 \r
 OBJ  = stub.o heap.o stdlib.o env.o stdio.o string.o rand.o\r
-OBJ += perror.o scanf.o signals.o strtoi.o strtof.o\r
-OBJ += printf.o time.o errno.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 += arch/$(ARCHDIR).ao\r
 # signals.o\r
 DEPFILES := $(OBJ:%.o=%.d)\r
@@ -26,8 +26,10 @@ endif
 include ../Makefile.tpl\r
 \r
 EXP_%.txt: TEST_%.native\r
-       ./TEST_printf.native > EXP_printf.txt\r
-       rm TEST_printf.native\r
+       ./$< > $@\r
+       rm $<\r
+EXP_strtoi.txt:\r
+       echo -n "" > $@\r
 \r
 %.native: %.c\r
        $(NCC) $< -o $@ -Wall -std=gnu99\r