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/armv7 - Task switching now supported
[tpg/acess2.git]
/
Modules
/
Makefile.tpl
diff --git
a/Modules/Makefile.tpl
b/Modules/Makefile.tpl
index
dc5d6f9
..
dda0f6b
100644
(file)
--- a/
Modules/Makefile.tpl
+++ b/
Modules/Makefile.tpl
@@
-27,10
+27,11
@@
else
BIN := ../$(NAME).xo.$(ARCH)
endif
BIN := ../$(NAME).xo.$(ARCH)
endif
-OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
+OBJ := $(addprefix obj-$(_SUFFIX)/,$(OBJ))
+#OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
-DEPFILES := $(filter %.o
.$(_SUFFIX)
,$(OBJ))
-DEPFILES := $(DEPFILES:%.o
.$(_SUFFIX)=%.d.$(ARCH)
)
+DEPFILES := $(filter %.o,$(OBJ))
+DEPFILES := $(DEPFILES:%.o
=%.d
)
.PHONY: all clean
.PHONY: all clean
@@
-38,18
+39,19
@@
all: $(BIN)
clean:
$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES) $(EXTRA)
clean:
$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES) $(EXTRA)
+ $(RM) -r obj-$(_SUFFIX)
install: $(BIN)
ifneq ($(BUILDTYPE),static)
install: $(BIN)
ifneq ($(BUILDTYPE),static)
- $(xMKDIR) $(DISTROOT)/Modules/$(ARCH)
+ @$(xMKDIR) $(DISTROOT)/Modules/$(ARCH); true
$(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
else
endif
$(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
else
endif
+
ifneq ($(BUILDTYPE),static)
$(BIN): %.kmd.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@
ifneq ($(BUILDTYPE),static)
$(BIN): %.kmd.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@
-# @$(LD) -T $(ACESSDIR)/Modules/link.ld --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ) -defsym=DriverInfo=_DriverInfo_$(FULLNAME)
@$(DISASM) $(BIN) > $(BIN).dsm
else
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ) -defsym=DriverInfo=_DriverInfo_$(FULLNAME)
@$(DISASM) $(BIN) > $(BIN).dsm
else
@@
-58,9
+60,10
@@
$(BIN): %.xo.$(ARCH): $(OBJ)
@$(LD) -r -o $@ $(OBJ)
endif
@$(LD) -r -o $@ $(OBJ)
endif
-
%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl
$(CFGFILES)
+
obj-$(_SUFFIX)/%.o: %.c Makefile
$(CFGFILES)
@echo --- $(CC) -o $@
@echo --- $(CC) -o $@
+ @mkdir -p $(dir $@)
@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- @$(CC) -M $(CPPFLAGS) -MT $@ -o
$*.d.$(ARCH)
$<
+ @$(CC) -M $(CPPFLAGS) -MT $@ -o
obj-$(_SUFFIX)/$*.d
$<
-include $(DEPFILES)
-include $(DEPFILES)
UCC
git Repository :: git.ucc.asn.au