X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=64749b3b8c03eb5af66bb364fc605fc290f047e4;hb=7d1c355c2843a140d5c474567c690402793aaa36;hp=2c2e62d60fdb82299c0774f4c28c78e9138fbafd;hpb=cff93fad3a4fc50cae99938d869356af2ab8a2e9;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 2c2e62d6..64749b3b 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,28 +4,35 @@
 -include ../Makefile.cfg
 
 CPPFLAGS += 
-CFLAGS   += -Werror -Wextra
+CFLAGS   += -nostdlib -Wall -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -Map map.txt
+LDFLAGS  += -nostdlib
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)
+LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
 
 INCFILES := stdio.h stdlib.h
 
-OBJ  = stub.o heap.o stdlib.o env.o stdio.o string.o rand.o
-OBJ += scanf.o signals.o strtoi.o strtof.o
-OBJ += printf.o time.o errno.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)) heap_native.o
+ #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