X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=7c3a4b8c463d86b9c1ea69fad293ef74fdc83ea6;hb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;hp=2d0051607143a795b506f38aa6e3c5c57a0cee6b;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 2d005160..7c3a4b8c 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -2,40 +2,38 @@
 #  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
+.PHONY: all clean install
 
 all:	$(BIN)
 
 clean:
-	$(RM) $(BIN) $(AOBJ) $(COBJ)
+	$(RM) $(BIN) $(AOBJ) $(COBJ) ld-acess.dmp ld-acess.dsm link.txt map.txt
+
+install: $(BIN)
+	$(xCP) $(BIN) $(DISTROOT)/Libs/
 
 $(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
+	$(OBJDUMP) -d $(BIN) > ld-acess.dsm
 
 $(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 $@ $<