X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=c615b6e96ed3907caeda14f0c174ec7764bcbfb0;hb=8735311896d1bd38ae79f1aa604ed81712bd5d97;hp=0fd1e5be127dcc0f77a66f5b31bf9b229b24def7;hpb=9f46a3aeffd6bbaff03610129924f85e44e82280;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 0fd1e5be..c615b6e9 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,25 +4,33 @@
 -include ../Makefile.cfg
 
 CPPFLAGS += 
-CFLAGS   += -Werror -Wextra
+CFLAGS   += -Wall -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so -Map map.txt
+LDFLAGS  += -Map map.txt
 
 INCFILES := stdio.h stdlib.h
 
-OBJ  = stub.o heap.o stdlib.o env.o stdio.o string.o rand.o
-OBJ += perror.o scanf.o signals.o strtoi.o strtof.o
-OBJ += printf.o
+OBJ  = stub.o heap.o stdlib.o env.o string.o rand.o
+OBJ += scanf.o signals.o strtoi.o strtof.o 
+OBJ += printf.o time.o timeconv.o errno.o ctype.o
+OBJ += stdio.o stdio_files.o
 OBJ += arch/$(ARCHDIR).ao
 # signals.o
 DEPFILES := $(OBJ:%.o=%.d)
 BIN = libc.so
+ifeq ($(ARCHDIR),native)
+ OBJ := $(filter-out heap.o,$(OBJ))
+ #LDFLAGS += -l c
+ BIN = libc_acess.so
+endif
 
 include ../Makefile.tpl
 
 EXP_%.txt: TEST_%.native
-	./TEST_printf.native > EXP_printf.txt
-	rm TEST_printf.native
+	./$< > $@
+	rm $<
+EXP_strtoi.txt:
+	echo -n "" > $@
 
 %.native: %.c
 	$(NCC) $< -o $@ -Wall -std=gnu99