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
Kernel/Makefile - Fixed error when starting a new build
[tpg/acess2.git]
/
Usermode
/
Libraries
/
Makefile.tpl
diff --git
a/Usermode/Libraries/Makefile.tpl
b/Usermode/Libraries/Makefile.tpl
index
51e404d
..
47acb80
100644
(file)
--- a/
Usermode/Libraries/Makefile.tpl
+++ b/
Usermode/Libraries/Makefile.tpl
@@
-2,10
+2,17
@@
# - Library Common Makefile
#
# - Library Common Makefile
#
-DEPFILES := $(addsuffix .d,$(OBJ))
_BIN := $(OUTPUTDIR)Libs/$(BIN)
_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
_BIN := $(OUTPUTDIR)Libs/$(BIN)
_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))
.PHONY: all clean install postbuild
.PHONY: all clean install postbuild
@@
-15,22
+22,40
@@
clean:
$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
install: all
$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
install: all
- $(xCP) $(_BIN) $(_XBIN) $(DISTROOT)/Libs/
-
-$(_BIN): $(OBJ)
+ @echo [xCP] $(DISTROOT)/Libs/$(BIN)
+ @$(xMKDIR) $(DISTROOT)/Libs; true
+ @$(STRIP) $(_BIN) -o $(_BIN)_
+ @$(xCP) $(_BIN)_ $(DISTROOT)/Libs/$(BIN)
+ @$(RM) $(_BIN)_
+ifneq ($(_XBIN),)
+ $(xCP) $(_XBIN) $(DISTROOT)/Libs/
+endif
+
+$(_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)
- @$(
OBJDUMP) -d -S $(_BIN) > $(_
BIN).dsm
+ @$(
DISASM) -S $(_BIN) > $(_OBJPREFIX)$(
BIN).dsm
-%.o: %.c
+
$(_OBJPREFIX)
%.o: %.c
@echo [CC] -o $@
@echo [CC] -o $@
+ @mkdir -p $(dir $@)
@$(CC) $(CFLAGS) -o $@ -c $<
@$(CC) $(CFLAGS) -o $@ -c $<
- @$(CC) -M -MT $@ $(CPPFLAGS) $< -o
[email protected]
+ @$(CC) -M -MT $@ $(CPPFLAGS) $< -o
[email protected]
ep
-%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
@echo [AS] -o $@
@echo [AS] -o $@
+ @mkdir -p $(dir $@)
@$(AS) $(ASFLAGS) -o $@ $<
@$(AS) $(ASFLAGS) -o $@ $<
- @$(AS) $(ASFLAGS) -o $@ $< -M >
[email protected]
+ifeq ($(ASSUFFIX),S)
+ @$(AS) $(ASFLAGS) -o
[email protected]
$< -M
+else
+ @$(AS) $(ASFLAGS) -o $@ $< -M >
[email protected]
+endif
+
+#$(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