X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=c8f4e5d3d7e0b4d28a94edcf28006b13f37ef3fc;hb=5baf31fcd4ec90827f62f7fbded545fda85ecdbb;hp=a12ff45b8599db7d1fc73c9ae956d380576ec68e;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index a12ff45b..c8f4e5d3 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,42 +4,30 @@
 -include ../Makefile.cfg
 
 CPPFLAGS += 
-CFLAGS   += 
+CFLAGS   += -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so -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
-
-.PHONY:	all clean install
-
-all: $(BIN)
+INCFILES := stdio.h stdlib.h
 
-clean:
-	$(RM) $(BIN) $(OBJ) $(DEPFILES) libc.so.dsm libc.so.dmp map.txt
-
-install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)/Libs/
-
-# 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
+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 time.o errno.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
 
-# C Runtime 0
-../crt0.o: crt0.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
+include ../Makefile.tpl
 
-$(filter %.o, $(OBJ)): %.o: %.c
-	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<
+EXP_%.txt: TEST_%.native
+	./TEST_printf.native > EXP_printf.txt
+	rm TEST_printf.native
 
-$(filter %.ao, $(OBJ)): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
+%.native: %.c
+	$(NCC) $< -o $@ -Wall -std=gnu99