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
Fix clean all script for renamed armv7 arch
[tpg/acess2.git]
/
Usermode
/
Applications
/
Makefile.tpl
diff --git
a/Usermode/Applications/Makefile.tpl
b/Usermode/Applications/Makefile.tpl
index
c940917
..
1339765
100644
(file)
--- a/
Usermode/Applications/Makefile.tpl
+++ b/
Usermode/Applications/Makefile.tpl
@@
-9,6
+9,9
@@
LDFLAGS +=
_BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
_OBJPREFIX := obj-$(ARCH)/
_BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
_OBJPREFIX := obj-$(ARCH)/
+_LIBS := $(filter -l%,$(LDFLAGS))
+_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
+
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
DEPFILES := $(OBJ:%.o=%.dep)
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
DEPFILES := $(OBJ:%.o=%.dep)
@@
-18,7
+21,8
@@
DEPFILES := $(OBJ:%.o=%.dep)
all: $(_BIN)
clean:
all: $(_BIN)
clean:
- @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt
+ @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm
+ @$(RM) -r $(_OBJPREFIX)
install: $(_BIN)
@echo [xCP] $(DISTROOT)/$(DIR)/$(BIN)
install: $(_BIN)
@echo [xCP] $(DISTROOT)/$(DIR)/$(BIN)
@@
-27,15
+31,15
@@
install: $(_BIN)
@$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
@$(RM) $(_BIN)_
@$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
@$(RM) $(_BIN)_
-$(_BIN): $(OBJ)
+$(_BIN): $(O
UTPUTDIR)Libs/acess.ld $(OUTPUTDIR)Libs/crt0.o $(_LIBS) $(O
BJ)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
ifneq ($(_DBGMAKEFILE),)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
ifneq ($(_DBGMAKEFILE),)
- $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+ $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map
$(_OBJPREFIX)
Map.txt
else
else
- @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+ @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map
$(_OBJPREFIX)
Map.txt
endif
endif
- @$(DISASM) $(_BIN) > $(BIN).dsm
+ @$(DISASM) $(_BIN) > $(
_OBJPREFIX)$(
BIN).dsm
$(OBJ): $(_OBJPREFIX)%.o: %.c
@echo [CC] -o $@
$(OBJ): $(_OBJPREFIX)%.o: %.c
@echo [CC] -o $@
@@
-45,4
+49,9
@@
endif
@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
+$(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