X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=64a120c2e53f5cbe5af0c64ca85048b3c7e64848;hb=954abc650a400e5d8798ed3565a02645a9eeec55;hp=3298402a2d3caa1ba8fad5a51534833a80f23058;hpb=04b368645c34cc3853fc13f93e33ac7878be8479;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 3298402a..64a120c2 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -1,37 +1,35 @@
-# Acess Dynamic Linker (ELF) Version 1
-#  LD-ACESS.SO
-#  Makefile
-
--include ../Makefile.cfg
-
-COBJ = main.o lib.o loadlib.o elf.o pe.o
-AOBJ = helpers.ao
-BIN = ../ld-acess.so
-
-CFLAGS   = -Wall -fno-builtin -fleading-underscore -fno-stack-protector
-ASFLAGS  = -felf
-LDFLAGS  = -T link.ld -Map map.txt -Bstatic
-
-
-.PHONY: all clean
-
-all:	$(BIN)
-
-clean:
-	$(RM) $(BIN) $(AOBJ) $(COBJ) ld-acess.dmp ld-acess.dsm link.txt map.txt
-
-$(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
-	cp $(BIN) $(DISTROOT)/Libs
-
-$(COBJ): %.o: %.c
-	@echo $(CC) -o $@
-	@$(CC) $(CFLAGS) -o $@ -c $<
-
-$(AOBJ): %.ao: %.asm
-	@echo $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
-	
+# Acess Dynamic Linker (ELF) Version 1
+#  LD-ACESS.SO
+#  Makefile
+
+-include ../Makefile.cfg
+
+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
+CFLAGS  += $(CPPFLAGS)
+ASFLAGS  = -felf
+LDFLAGS  = -T link.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 $@ $<
+
+# Preprocessing objects if needed
+$(_OBJPREFIX)%: %.h
+	@echo [CPP] -o $@
+	@mkdir -p $(dir $@)
+	@$(CPP) $(CPPFLAGS) -P -D_ASM_ $< -o $@
+