git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/ld-acess - Fixing ELF loader modifying .text during relocation
[tpg/acess2.git]
/
Usermode
/
Libraries
/
Makefile.tpl
diff --git
a/Usermode/Libraries/Makefile.tpl
b/Usermode/Libraries/Makefile.tpl
index
29129b6
..
5ca97a9
100644
(file)
--- a/
Usermode/Libraries/Makefile.tpl
+++ b/
Usermode/Libraries/Makefile.tpl
@@
-7,6
+7,9
@@
_BIN := $(OUTPUTDIR)Libs/$(BIN)
_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
_OBJPREFIX := obj-$(ARCH)/
_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
_OBJPREFIX := obj-$(ARCH)/
+_LIBS := $(filter -l%,$(LDFLAGS))
+_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
+
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
DEPFILES := $(addsuffix .dep,$(OBJ))
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
DEPFILES := $(addsuffix .dep,$(OBJ))
@@
-28,11
+31,11
@@
ifneq ($(_XBIN),)
$(xCP) $(_XBIN) $(DISTROOT)/Libs/
endif
$(xCP) $(_XBIN) $(DISTROOT)/Libs/
endif
-$(_BIN): $(OBJ)
+$(_BIN): $(OBJ)
$(_LIBS)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $(BIN) $(OBJ)
@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $(BIN) $(OBJ)
@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
- @$(DISASM)
$(_BIN) > $(_
BIN).dsm
+ @$(DISASM)
-S $(_BIN) > $(_OBJPREFIX)$(
BIN).dsm
$(_OBJPREFIX)%.o: %.c
@echo [CC] -o $@
$(_OBJPREFIX)%.o: %.c
@echo [CC] -o $@
@@
-46,4
+49,9
@@
$(_OBJPREFIX)%.ao: %.asm
@$(AS) $(ASFLAGS) -o $@ $<
@$(AS) $(ASFLAGS) -o $@ $< -M >
[email protected]
@$(AS) $(ASFLAGS) -o $@ $<
@$(AS) $(ASFLAGS) -o $@ $< -M >
[email protected]
+#$(OUTPUTDIR)Libs/libld-acess.so:
+# @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+ @make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
+
-include $(DEPFILES)
-include $(DEPFILES)
UCC
git Repository :: git.ucc.asn.au