X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2FMakefile;h=1e3fc4650112653d47137fcfbf0b091a45261271;hb=45f9a29e481ce9ea7ca7121541f0e0f90147f5b1;hp=293f783c904840f97c8a6cc36a3c9fe1e1da6945;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 293f783c..1e3fc465 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -1,46 +1,46 @@
-# AcessOS Basic C Library
+# Acess2 Basic C Library
 # Makefile
 
-CC = gcc
-AS = nasm
-RM = @rm -f
-LD = ld
-OBJDUMP = objdump
-ACESSDIR = /home/hodgeja/Projects/Acess2
+-include ../Makefile.cfg
 
-CPPFLAGS = -I$(ACESSDIR)/Usermode/include
-CFLAGS = -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
-ASFLAGS = -felf
-LDFLAGS = -x -shared -soname libc.so.1 -Map map.txt -e SoMain -L$(ACESSDIR)/Usermode/Libraries -lacess
+CPPFLAGS += 
+CFLAGS   += 
+ASFLAGS  +=
+LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc
 
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o signals.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 /mnt/AcessHDD/Acess2/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 $@ $<