X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=b890d482b39689907171995c92c9c069f6e573a2;hb=04a050f42807686dc119838c82372409246d55bb;hp=bf7b8d15af87677237c1d44fbf84b5f525ea2c9d;hpb=5c46f86c5a8ceaa63a1a9919cf1f4d2889c6c233;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index bf7b8d15..b890d482 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,41 +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 = 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)
+INCFILES := stdio.h stdlib.h
 
-clean:
-	$(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt
-
-# 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
-	$(xCP) ../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 select.o rand.o
+OBJ += perror.o scanf.o signals.o strtoi.o
+OBJ += arch/$(ARCHDIR).ao
+# signals.o
+DEPFILES := $(OBJ:%.o=%.d)
+BIN = libc.so
 
-$(filter %.o, $(OBJ)): %.o: %.c
-	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<
+include ../Makefile.tpl
 
-$(filter %.ao, $(OBJ)): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<