X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=634909163a5773418f651a199f6b8b2ac0e55a68;hb=9d3800f60f2212432e550a4e003ae65b498a4d36;hp=2d0051607143a795b506f38aa6e3c5c57a0cee6b;hpb=51adc08a1e11fe9e5389e6e7c3e3a4ea4973917b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 2d005160..63490916 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -2,22 +2,15 @@
 #  LD-ACESS.SO
 #  Makefile
 
-CC = gcc
-AS = nasm
-RM = @rm -f
-LD = ld
-OBJDUMP = objdump
+-include ../Makefile.cfg
 
 COBJ = main.o lib.o loadlib.o elf.o pe.o
 AOBJ = helpers.ao
 BIN = ../ld-acess.so
 
-CPPFLAGS = -I../../include
-CFLAGS = -Wall -fno-builtin -fleading-underscore -fno-stack-protector
-ASFLAGS = -felf
-#LDFLAGS = --oformat elf32-i386 -Map map.txt -Bstatic -e _SoMain -shared
-#LDFLAGS = --oformat elf32-i386 -Map map.txt -Bstatic -e _SoMain -Ttext 0xBFFFE000
-LDFLAGS = -T link.ld -Map map.txt -Bstatic
+CFLAGS   = -Wall -fno-builtin -fleading-underscore -fno-stack-protector
+ASFLAGS  = -felf
+LDFLAGS  = -T link.ld -Map map.txt -Bstatic
 
 
 .PHONY: all clean
@@ -28,14 +21,17 @@ clean:
 	$(RM) $(BIN) $(AOBJ) $(COBJ)
 
 $(BIN): $(AOBJ) $(COBJ)
-	$(LD) $(LDFLAGS) -o $(BIN) $(AOBJ) $(COBJ) > link.txt
+	@echo --- $(LD) -shared -o $@
+	@$(LD) $(LDFLAGS) -o $(BIN) $(AOBJ) $(COBJ) > link.txt
 	$(OBJDUMP) -x $(BIN) > ld-acess.dmp
 	$(OBJDUMP) -d $(BIN) > ld-acess.dsm
-	cp $(BIN) /mnt/AcessHDD/Acess2/Libs
+	cp $(BIN) $(DISTROOT)/Libs
 
 $(COBJ): %.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo $(CC) -o $@
+	@$(CC) $(CFLAGS) -o $@ -c $<
 
 $(AOBJ): %.ao: %.asm
-	$(AS) $(ASFLAGS) -o $@ $<
+	@echo $(AS) -o $@
+	@$(AS) $(ASFLAGS) -o $@ $<