X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=c29e0e5fb597ea8c6ddc7a8c9b0a126afb2cbf85;hb=9d101ee5f5231954a7102da36997aa8d568a6157;hp=f9895a8fd53001c2359cd115f98c6f8ee207bf15;hpb=04b368645c34cc3853fc13f93e33ac7878be8479;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index f9895a8f..c29e0e5f 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,39 +4,18 @@
 -include ../Makefile.cfg
 
 CPPFLAGS += 
-CFLAGS   += 
+CFLAGS   += -Werror -Wextra
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc
+LDFLAGS  += -soname libc.so -Map map.txt
 
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o string.o
-# signals.o
-BIN = ../libc.so.1
-
-.PHONY:	all clean
-
-all: $(BIN) $(OBJ_LIBC)
+INCFILES := stdio.h stdlib.h
 
-clean:
-	$(RM) $(BIN) ../libc.so $(OBJ_LIBC) libc.so.1.dsm libc.so.1.dmp map.txt
-
-# Core C Library
-$(BIN): $(OBJ_LIBC)
-	@echo --- ld -shared -o $@
-	@$(LD) $(LDFLAGS) $(OBJ_LIBC) -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 $@ $<
+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 += arch/$(ARCHDIR).ao
+# signals.o
+DEPFILES := $(OBJ:%.o=%.d)
+BIN = libc.so
 
-$(filter %.o, $(OBJ_LIBC)): %.o: %.c config.h
-	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
+include ../Makefile.tpl
 
-$(filter %.ao, $(OBJ_LIBC)): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<