X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=87b8213055eec750a437aa5847893add5759b6e9;hb=846645bd8f738dc22641e96866fffd2f59b5639b;hp=3c02d3dbc78efa06db344e5dff7b610c1a214ac4;hpb=4726431cb7e0bada749b32f9e51dedadf882d50b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 3c02d3db..87b82130 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -4,18 +4,33 @@
 
 -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   = -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector -fPIC
+CFLAGS  += $(CPPFLAGS)
+LDFLAGS  = -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 $@