X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=6484897bcc89929b4eec1c5a9132ec21291ae622;hb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;hp=1e3fc4650112653d47137fcfbf0b091a45261271;hpb=c7c5c4dbeb7b298675856eebb36084c92e989d98;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 1e3fc465..6484897b 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,41 +6,16 @@
 CPPFLAGS += 
 CFLAGS   += 
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc
+LDFLAGS  += -soname libc.so -Map map.txt -lgcc
 
-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 install
-
-all: $(BIN)
-
-clean:
-	$(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt
+INCFILES := stdio.h stdlib.h
 
-install: $(BIN)
-	$(xCP) ../libc.so.1 $(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
-	cp ../libc.so.1 ../libc.so
-
-# C Runtime 0
-../crt0.o: crt0.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
+OBJ  = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o rand.o
+OBJ += perror.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 $@ $<