X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=AcessNative%2Fld-acess_src%2FMakefile;h=bbce43dfd3199971c0cd2a4776c676114e34f7d6;hb=c84c6acf1e8be4fb6e76ef0f8fd275400be8d5ae;hp=4fb6ae281ac53357460cde4c5062d4876dc7e5ab;hpb=a09032f44bba55ce1e60dfab92a39cf6c909220b;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/Makefile b/AcessNative/ld-acess_src/Makefile
index 4fb6ae28..bbce43df 100644
--- a/AcessNative/ld-acess_src/Makefile
+++ b/AcessNative/ld-acess_src/Makefile
@@ -5,9 +5,9 @@ ifeq ($(PLATFORM),)
 	PLATFORM := lin
 endif
 
-OBJ := main.o syscalls.o request.o binary.o memory.o
-OBJ += elf.o
-OBJ := $(addsuffix .$(PLATFORM),$(OBJ))
+OBJ := main.o syscalls.o request.o binary.o memory.o exports.o
+OBJ += elf.o elf_load.o
+OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
 
 ifeq ($(PLATFORM),win)
 	BIN := ../ld-acess.exe
@@ -19,21 +19,30 @@ endif
 
 CFLAGS += -Wall -Werror -g -m32
 
+DEPFILES  = $(filter %.o,$(OBJ))
+DEPFILES := $(DEPFILES:%=%.dep)
+
 .PHONY: all clean
 
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ)
+	$(RM) $(BIN) $(OBJ) $(DEPFILES)
 
-$(BIN): link.ld.$(PLATFORM) $(OBJ)
-#	$(LD) -g -o $@ $(OBJ) -T link.ld.$(PLATFORM)
-	$(CC) -g -o $@ $(OBJ) -m32 -Wl,-T,link.ld.$(PLATFORM)
+$(BIN): obj-$(PLATFORM)/link.ld $(OBJ)
+	$(CC) -g -o $@ $(OBJ) -m32 -Wl,-T,obj-$(PLATFORM)/link.ld
 
-%.o.$(PLATFORM): %.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+obj-$(PLATFORM)/%.o: %.c
+	@mkdir -p $(dir $@)
+	@echo [CC] -o $@
+	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
 
 # Modify the default makefile to put the executable at 1MB instead
-link.ld.lin:
-	$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x0[08][0-9]*\b/0x00100000/g' > $@
+obj-lin/link.ld:
+	@mkdir -p $(dir $@)
+	@echo "Making Linker Script ($@)"
+	@$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x0[08][0-9]*\b/0x00100000/g' > $@
+
+-include $(DEPFILES)