-include ../Makefile.cfg
-COBJ = main.o lib.o loadlib.o elf.o pe.o
-AOBJ = 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
-
-
-.PHONY: all clean install
-
-all: $(BIN)
-
-clean:
- $(RM) $(BIN) $(AOBJ) $(COBJ) ld-acess.dmp ld-acess.dsm link.txt map.txt
-
-install: $(BIN)
- $(xCP) $(BIN) $(DISTROOT)/Libs/
+OBJ := main.o lib.o loadlib.o export.o elf.o pe.o
+OBJ += arch/$(ARCHDIR).ao
+BIN = ld-acess.so
+EXTRABIN := libld-acess.so
+
+CFLAGS = -g -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector
+CFLAGS += $(CPPFLAGS)
+LDFLAGS = -g -T arch/$(ARCHDIR).ld -Map map.txt --export-dynamic
+
+include ../Makefile.tpl
+
+# create libld-acess.so
+$(_XBIN): $(_BIN)
+ @echo [LD] -o -shared libld-acess.so
+ @$(LD) $(LDFLAGS) -shared -o $@ $(OBJ)
+
+# Override .ao to look in the object prefix for the source
+%.ao: %.asm
+ @echo [AS] -o $@
+ @mkdir -p $(dir $@)
+ @$(AS) $(ASFLAGS) -o $@ $<
-$(BIN): $(AOBJ) $(COBJ)
- @echo --- $(LD) -shared -o $@
- @$(LD) $(LDFLAGS) -o $(BIN) $(AOBJ) $(COBJ) > link.txt
- $(OBJDUMP) -x $(BIN) > ld-acess.dmp
- $(OBJDUMP) -d $(BIN) > ld-acess.dsm
+.PRECIOUS: $(OBJ:%.ao=%.asm)
-$(COBJ): %.o: %.c
- @echo $(CC) -o $@
- @$(CC) $(CFLAGS) -o $@ -c $<
+# Preprocessing objects if needed
+$(_OBJPREFIX)%: %.h
+ @echo [CPP] -o $@
+ @mkdir -p $(dir $@)
+ @$(CPP) $(CPPFLAGS) -P -D_ASM_ $< -o $@
-$(AOBJ): %.ao: %.asm
- @echo $(AS) -o $@
- @$(AS) $(ASFLAGS) -o $@ $<
-