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

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index c2979a07..1e3fc465 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,37 +6,41 @@
 CPPFLAGS += 
 CFLAGS   += 
 ASFLAGS  +=
-LDFLAGS  += -soname libc.so.1 -Map map.txt
+LDFLAGS  += -soname libc.so.1 -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
 
-.PHONY:	all clean
+.PHONY:	all clean install
 
-all: $(BIN) $(OBJ_LIBC)
+all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ_LIBC)
+	$(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt
+
+install: $(BIN)
+	$(xCP) ../libc.so.1 $(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
+	@$(LD) $(LDFLAGS) $(OBJ) -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 $@ $<
 
-$(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 $@ $<