X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Frules.mk;h=a2f7ecc44805b90aece5136eeea79eccb5f6901f;hb=7b64f5e7f00e445a5637e9e3289a1332a14d28e5;hp=2c8644183ea8b59ff203d43ca59a126970eb6ba4;hpb=05abefc2a27a08f381bca41524a5d299c4839ff2;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/rules.mk b/Usermode/Libraries/ld-acess.so_src/rules.mk
index 2c864418..a2f7ecc4 100644
--- a/Usermode/Libraries/ld-acess.so_src/rules.mk
+++ b/Usermode/Libraries/ld-acess.so_src/rules.mk
@@ -1,40 +1,21 @@
-# Acess2 - ld-acess
+# ld-acess
 include $(BASE)header.mk
 
 # Variables
 SRCS := main.c lib.c loadlib.c export.c elf.c pe.c
 SRCS += arch/$(ARCHDIR).$(ASSUFFIX)
 BIN  := $(OUTPUTDIR)Libs/ld-acess.so
-XOBJ := $(call fcn_mkobj,_stublib.o)
-XBIN := $(OUTPUTDIR)Libs/libld-acess.so
 
 CFLAGS-$(DIR) := -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector -fPIC -g
 CPPFLAGS-$(DIR) := $(CPPFLAGS-$(PDIR))
 LDFLAGS-$(DIR) := -g -T $(DIR)/arch/$(ARCHDIR).ld -Map $(call fcn_mkobj,map.txt) --export-dynamic
 
-OBJ := $(call fcn_src2obj,$(SRCS))
-ALL_OBJ := $(ALL_OBJ) $(OBJ)
-OBJ-$(DIR) := $(OBJ) $(XOBJ)
-BIN-$(DIR) := $(BIN) $(XBIN)
+include $(BASE)body.mk
 
-# Rules
-.PHONY: all-$(DIR) clean-$(DIR)
-
-all-$(DIR): $(BIN-$(DIR))
-clean-$(DIR): clean-%: 
-	$(eval BIN=$(BIN-$*/))
-	$(eval OBJ=$(OBJ-$*/))
-	$(RM) $(BIN) $(OBJ)
-
-$(BIN): $(OBJ)
-
-# Stub library
-$(XBIN): $(call fcn_mkobj,_stublib.c.o)
-	@echo [LD] -shared -o libld-acess.so
-	@$(LD) -shared -o $@ $<
+$(call fcn_addbin,$(OUTPUTDIR)Libs/libld-acess.so,$(call fcn_src2obj,_stublib.c))
 
 # Handle preprocessed files
-$(DIR)/%: $(DIR)/%.h
+$(DIR)%: $(DIR)%.h
 	@echo [CPP] -o $@
 	@mkdir -p $(dir $@)
 	@$(CPP) $(CPPFLAGS-$(DIR)) -P -D__ASSEMBLER__ $< -o $@