X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=a12ff45b8599db7d1fc73c9ae956d380576ec68e;hb=fe313c1dda9bd0e062f5ce88c3d990199799aa1b;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..a12ff45b 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,37 +6,40 @@
 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
+OBJ = stub.o heap.o stdlib.o env.o fileIO.o string.o
+DEPFILES := $(OBJ:%.o=%.d)
 # signals.o
-BIN = ../libc.so.1
+BIN = ../libc.so
 
-.PHONY:	all clean
+.PHONY:	all clean install
 
-all: $(BIN) $(OBJ_LIBC)
+all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ_LIBC)
+	$(RM) $(BIN) $(OBJ) $(DEPFILES) libc.so.dsm libc.so.dmp map.txt
+
+install: $(BIN)
+	$(xCP) $(BIN) $(DISTROOT)/Libs/
 
 # Core C Library
-$(BIN): $(OBJ_LIBC)
+$(BIN): $(OBJ)
 	@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/
+	@$(LD) $(LDFLAGS) $(OBJ) -o $@
+	@$(OBJDUMP) -d $@ > libc.so.1.dsm
+	@$(OBJDUMP) -x -r -R $@ > libc.so.1.dmp
 
 # C Runtime 0
 ../crt0.o: crt0.asm
 	@echo --- $(AS) -o $@
 	@$(AS) $(ASFLAGS) -o $@ $<
 
-$(filter %.o, $(OBJ_LIBC)): %.o: %.c config.h
+$(filter %.o, $(OBJ)): %.o: %.c
 	@echo --- $(CC) -o $@
 	@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<
 
-$(filter %.ao, $(OBJ_LIBC)): %.ao: %.asm
+$(filter %.ao, $(OBJ)): %.ao: %.asm
 	@echo --- $(AS) -o $@
 	@$(AS) $(ASFLAGS) -o $@ $<