X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=9abc578ac4d081061b50e55ba762b24b61358f54;hb=4bd23d4ae51bd5cb92b449bcd66e0d2de88c7fc9;hp=32eb52b4f2f90adbc3ae9b15318a14bbaba0a63b;hpb=a2210987109ab5a6337c72b45f7e52cfc9092f8f;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 32eb52b4..9abc578a 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,37 +6,21 @@
 CPPFLAGS += 
 CFLAGS   += 
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc
+LDFLAGS  += -soname libc.so -Map map.txt -lgcc
 
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o string.o
-# signals.o
-BIN = ../libc.so.1
-
-.PHONY:	all clean
+INCFILES := stdio.h stdlib.h
 
-all: $(BIN) $(OBJ_LIBC)
+OBJ  = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o rand.o
+OBJ += arch/$(ARCHDIR).ao
+# signals.o
+DEPFILES := $(OBJ:%.o=%.d)
+BIN = libc.so
 
-clean:
-	$(RM) $(BIN) $(OBJ_LIBC)
+include ../Makefile.tpl
 
-# 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/
+#all: $(OUTPUTDIR)Libs/crt0.o
 
 # C Runtime 0
-../crt0.o: crt0.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
-
-$(filter %.o, $(OBJ_LIBC)): %.o: %.c config.h
-	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
-
-$(filter %.ao, $(OBJ_LIBC)): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
+#$(OUTPUTDIR)Libs/crt0.o: crt0.asm
+#	@echo --- $(AS) -o $@
+#	@$(AS) $(ASFLAGS) -o $@ $<