Merge branch 'master' of git://git.ucc.asn.au/acess2

[tpg/acess2.git] / Usermode / Libraries / ld-acess.so_src / Makefile

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