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]
/
AcessNative
/
ld-acess_src
/
Makefile
diff --git
a/AcessNative/ld-acess_src/Makefile
b/AcessNative/ld-acess_src/Makefile
index
f7543fd
..
5a604a3
100644
(file)
--- a/
AcessNative/ld-acess_src/Makefile
+++ b/
AcessNative/ld-acess_src/Makefile
@@
-7,7
+7,7
@@
endif
OBJ := main.o syscalls.o request.o binary.o memory.o
OBJ += elf.o
OBJ := main.o syscalls.o request.o binary.o memory.o
OBJ += elf.o
-OBJ := $(add
suffix .$(PLATFORM)
,$(OBJ))
+OBJ := $(add
prefix obj-$(PLATFORM)/
,$(OBJ))
ifeq ($(PLATFORM),win)
BIN := ../ld-acess.exe
ifeq ($(PLATFORM),win)
BIN := ../ld-acess.exe
@@
-19,27
+19,30
@@
endif
CFLAGS += -Wall -Werror -g -m32
CFLAGS += -Wall -Werror -g -m32
-DEPFILES = $(filter %.o
.$(PLATFORM)
,$(OBJ))
-DEPFILES := $(DEPFILES:%
.o.$(PLATFORM)=%.d.$(PLATFORM)
)
+DEPFILES = $(filter %.o,$(OBJ))
+DEPFILES := $(DEPFILES:%
=%.dep
)
.PHONY: all clean
all: $(BIN)
clean:
.PHONY: all clean
all: $(BIN)
clean:
- $(RM) $(BIN) $(OBJ)
+ $(RM) $(BIN) $(OBJ)
$(DEPFILES)
-$(BIN): link.ld.$(PLATFORM) $(OBJ)
-# $(LD) -g -o $@ $(OBJ) -T link.ld.$(PLATFORM)
- $(CC) -g -o $@ $(OBJ) -m32 -Wl,-T,link.ld.$(PLATFORM)
+$(BIN): obj-$(PLATFORM)/link.ld $(OBJ)
+ $(CC) -g -o $@ $(OBJ) -m32 -Wl,-T,obj-$(PLATFORM)/link.ld
-%.o.$(PLATFORM): %.c
+obj-$(PLATFORM)/%.o: %.c
+ @mkdir -p $(dir $@)
@echo [CC] -o $@
@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
@echo [CC] -o $@
@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
- @$(CC) -M $(CPPFLAGS) -MT $@ -o $
*.d.$(PLATFORM)
$<
+ @$(CC) -M $(CPPFLAGS) -MT $@ -o $
@.dep
$<
# Modify the default makefile to put the executable at 1MB instead
# Modify the default makefile to put the executable at 1MB instead
-link.ld.lin:
- @echo Making Linker Script ($@)
+obj-lin/link.ld:
+ @mkdir -p $(dir $@)
+ @echo "Making Linker Script ($@)"
@$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x0[08][0-9]*\b/0x00100000/g' > $@
@$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x0[08][0-9]*\b/0x00100000/g' > $@
+-include $(DEPFILES)
+
UCC
git Repository :: git.ucc.asn.au