X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=c615b6e96ed3907caeda14f0c174ec7764bcbfb0;hb=41f5d1923eac00f90097f80e51f0c1f8d1ab7cb3;hp=ada30884a604b6690760fc267e1eb4f8d2174348;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index ada30884..c615b6e9 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,41 +4,33 @@
 -include ../Makefile.cfg
 
 CPPFLAGS += 
-CFLAGS   += 
+CFLAGS   += -Wall -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc
+LDFLAGS  += -Map map.txt
 
-OBJ = stub.o heap.o stdlib.o env.o fileIO.o string.o
-DEPFILES := $(OBJ:%.o=%.d)
-# signals.o
-BIN = ../libc.so.1
-
-.PHONY:	all clean
-
-all: $(BIN)
-
-clean:
-	$(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt
+INCFILES := stdio.h stdlib.h
 
-# Core C Library
-$(BIN): $(OBJ)
-	@echo --- ld -shared -o $@
-	@$(LD) $(LDFLAGS) $(OBJ) -o $@
-	@$(OBJDUMP) -d $@ > libc.so.1.dsm
-	@$(OBJDUMP) -x -r -R $@ > libc.so.1.dmp
-	cp ../libc.so.1 ../libc.so
-	cp ../libc.so.1 $(DISTROOT)/Libs/
-
-# C Runtime 0
-../crt0.o: crt0.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
-
-$(filter %.o, $(OBJ)): %.o: %.c
-	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<
-
-$(filter %.ao, $(OBJ)): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -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
+	./$< > $@
+	rm $<
+EXP_strtoi.txt:
+	echo -n "" > $@
+
+%.native: %.c
+	$(NCC) $< -o $@ -Wall -std=gnu99