X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=48bb38faaf4fd0807bf16f3659b6217fc2102e4c;hb=92517b68b7582251f69db7e062d5e5a4c773791f;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..48bb38fa 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -1,41 +1,16 @@
-# Acess Dynamic Linker (ELF) Version 1
-#  LD-ACESS.SO
-#  Makefile
-
-CC = gcc
-AS = nasm
-RM = @rm -f
-LD = ld
-OBJDUMP = objdump
-
-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
-
-
-.PHONY: all clean
-
-all:	$(BIN)
-
-clean:
-	$(RM) $(BIN) $(AOBJ) $(COBJ)
-
-$(BIN): $(AOBJ) $(COBJ)
-	$(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
-
-$(COBJ): %.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(AOBJ): %.ao: %.asm
-	$(AS) $(ASFLAGS) -o $@ $<
-	
+# Acess Dynamic Linker (ELF) Version 1
+#  LD-ACESS.SO
+#  Makefile
+
+-include ../Makefile.cfg
+
+OBJ := main.o lib.o loadlib.o elf.o pe.o
+OBJ += core.ao vfs.ao mm.ao
+BIN = ld-acess.so
+
+CFLAGS   = -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector
+ASFLAGS  = -felf
+LDFLAGS  = -T link.ld -Map map.txt -Bstatic
+
+include ../Makefile.tpl
+