X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=4dc881c09ca2ed4ce5c8e03bac892cb27d49fb91;hb=bc856d707899a00153bb1575f1c05867177dfe41;hp=48bb38faaf4fd0807bf16f3659b6217fc2102e4c;hpb=cb8ee714fcb4fce504fd767462789093a9fecbb1;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile
index 48bb38fa..4dc881c0 100644
--- a/Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/Usermode/Libraries/ld-acess.so_src/Makefile
@@ -4,13 +4,52 @@
 
 -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
+EXTRACLEAN = $(_OBJPREFIX)_stublib.o
+INCFILES := sys/sys.h
 
-CFLAGS   = -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector
-ASFLAGS  = -felf
-LDFLAGS  = -T link.ld -Map map.txt -Bstatic
+CFLAGS   = -g -Wall -fno-builtin -fno-stack-protector -fPIC -std=c99
+# -fno-leading-underscore
+CFLAGS  += $(CPPFLAGS)
+LDFLAGS  = -g -T arch/$(ARCHDIR).ld -Map map.txt --export-dynamic
+
+ifeq ($(ARCH),native)
+XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN)) 
+$(XBIN): obj-$(ARCH)/_stublib.o
+all: $(XBIN)
+CFLAGS += -ffreestanding
+LDFLAGS := 
+BIN := 
+OBJ :=
+endif
 
 include ../Makefile.tpl
 
+# create libld-acess.so
+$(_XBIN): $(_OBJPREFIX)_stublib.o
+	@echo [LD] -o -shared libld-acess.so
+	$(LD) -shared -o $@ $<
+#	@$(LD) $(LDFLAGS) -o $@ $(OBJ)
+
+
+# Override .ao to look in the object prefix for the source
+$(_OBJPREFIX)arch/$(ARCHDIR).ao_: $(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX)
+	@echo [AS] -o $@
+	@mkdir -p $(dir $@)
+	@$(AS) $(ASFLAGS) -o $@ $<
+
+#.PRECIOUS: $(OBJ:%.ao=%.asm)
+
+# Preprocessing objects if needed
+$(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): arch/$(ARCHDIR).$(ASSUFFIX).h arch/syscalls.s.h
+	@echo [CPP] -o $@
+	@mkdir -p $(dir $@)
+	@$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@
+
+$(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): $(ACESSDIR)/KernelLand/Kernel/include/syscalls.h
+
+$(_OBJPREFIX)_stublib.o: arch/syscalls.s.h
+