Fixed compile issues in AxWin2 WM

[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..48bb38f 100644 (file)
--- 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\r
-#  LD-ACESS.SO\r
-#  Makefile\r
-\r
-CC = gcc\r
-AS = nasm\r
-RM = @rm -f\r
-LD = ld\r
-OBJDUMP = objdump\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
-\r
-\r
-.PHONY: all clean\r
-\r
-all:   $(BIN)\r
-\r
-clean:\r
-       $(RM) $(BIN) $(AOBJ) $(COBJ)\r
-\r
-$(BIN): $(AOBJ) $(COBJ)\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
-\r
-$(COBJ): %.o: %.c\r
-       $(CC) $(CFLAGS) -o $@ -c $<\r
-\r
-$(AOBJ): %.ao: %.asm\r
-       $(AS) $(ASFLAGS) -o $@ $<\r
-       
+# 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
+