-include ../Makefile.cfg
-OBJ := main.o lib.o loadlib.o elf.o pe.o
-OBJ += core.ao vfs.ao mm.ao
+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 = -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector
-ASFLAGS = -felf
-LDFLAGS = -T link.ld -Map map.txt -Bstatic -shared
+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
-postbuild: $(OUTPUTDIR)Libs/libld-acess.so
+# create libld-acess.so
+$(_XBIN): $(_BIN)
+ @echo [LD] -o -shared libld-acess.so
+ @$(LD) $(LDFLAGS) -shared -o $@ $(OBJ)
-$(OUTPUTDIR)Libs/libld-acess.so:
- ln -s $(_BIN) $(OUTPUTDIR)Libs/libld-acess.so
+# Override .ao to look in the object prefix for the source
+%.ao: %.asm
+ @echo [AS] -o $@
+ @mkdir -p $(dir $@)
+ @$(AS) $(ASFLAGS) -o $@ $<
+
+.PRECIOUS: $(OBJ:%.ao=%.asm)
+
+# Preprocessing objects if needed
+$(_OBJPREFIX)%: %.h
+ @echo [CPP] -o $@
+ @mkdir -p $(dir $@)
+ @$(CPP) $(CPPFLAGS) -P -D_ASM_ $< -o $@