projects
/
jump.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dol: add support for iterated ports and processes
[jump.git]
/
dol
/
src
/
dol
/
visitor
/
epiphany
/
template
/
Makefile
diff --git
a/dol/src/dol/visitor/epiphany/template/Makefile
b/dol/src/dol/visitor/epiphany/template/Makefile
index 90cc3bf2c6cb7073f20a33bfb9b343343a5d6440..bfafbde11a11e1fc0133144cb8de989aa5120a1a 100644
(file)
--- a/
dol/src/dol/visitor/epiphany/template/Makefile
+++ b/
dol/src/dol/visitor/epiphany/template/Makefile
@@
-18,7
+18,6
@@
HOBJS = $(HDEST)/main.o
# Epiphany applications and common objects
EPAPPS = @@SREC_FILES@@
# Epiphany applications and common objects
EPAPPS = @@SREC_FILES@@
-EWRAPPERS = $(patsubst $(DEST)%,$(EDEST)%,$(EPAPPS:.srec=_Wrapper.o))
ECOMMON = $(EDEST)/dol.o $(EDEST)/ports.o $(EDEST)/index.o
# Epiphany build flags
ECOMMON = $(EDEST)/dol.o $(EDEST)/ports.o $(EDEST)/index.o
# Epiphany build flags
@@
-33,48
+32,50
@@
HOSTCC = gcc
HCFLAGS = -O2 -std=c99 -I$(EPIPHANY_HOME)/tools/host/include -Wall
HLFLAGS = -L$(EPIPHANY_HOME)/tools/host/lib -le-hal
HCFLAGS = -O2 -std=c99 -I$(EPIPHANY_HOME)/tools/host/include -Wall
HLFLAGS = -L$(EPIPHANY_HOME)/tools/host/lib -le-hal
-# Global rules
+# ===========================================================================
+ECHO = /bin/echo -e
.SECONDARY:
.PHONY: all run host cores clean
all: run
host: $(HOSTAPP)
.SECONDARY:
.PHONY: all run host cores clean
all: run
host: $(HOSTAPP)
-cores: $(ECOMMON) $(E
WRAPPERS) $(E
PAPPS)
+cores: $(ECOMMON) $(EPAPPS)
run: host cores
run: host cores
- @
echo -e
"\tRUN"
+ @
$(ECHO)
"\tRUN"
@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
EPIPHANY_HDF=$(EPIPHANY_HDF) \
$(HOSTAPP)
clean:
@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
EPIPHANY_HDF=$(EPIPHANY_HDF) \
$(HOSTAPP)
clean:
- @
echo -e
"\tCLEAN"
+ @
$(ECHO)
"\tCLEAN"
@rm -v -f $(HOSTAPP) $(EPAPPS) $(EDEST)/* $(HDEST)/*
# Host rules
$(HOSTAPP): $(HOBJS)
@rm -v -f $(HOSTAPP) $(EPAPPS) $(EDEST)/* $(HDEST)/*
# Host rules
$(HOSTAPP): $(HOBJS)
- @
echo -e
"\t(HOST) LINK\t$@"
+ @
$(ECHO)
"\t(HOST) LINK\t$@"
@$(HOSTCC) -o $@ $^ $(HLFLAGS)
$(HDEST)/%.o: $(HSRC)/%.c
@$(HOSTCC) -o $@ $^ $(HLFLAGS)
$(HDEST)/%.o: $(HSRC)/%.c
- @
echo -e
"\t(HOST) CC\t$@"
+ @
$(ECHO)
"\t(HOST) CC\t$@"
@$(HOSTCC) $(HCFLAGS) -c -o $@ $^
# Epiphany rules
$(DEST)/%.srec: $(EDEST)/%.elf
@$(HOSTCC) $(HCFLAGS) -c -o $@ $^
# Epiphany rules
$(DEST)/%.srec: $(EDEST)/%.elf
- @
echo -e "\t(EPIPHANY) OBJCOPY
$@"
+ @
$(ECHO) "\t(EPIPHANY) OBJCOPY\t
$@"
@$(OBJCOPY) $(OCFLAGS) --output-target srec --srec-forceS3 $^ $@
@$(OBJCOPY) $(OCFLAGS) --output-target srec --srec-forceS3 $^ $@
-$(EDEST)/%.elf: $(EDEST)/%.o $(EDEST)/%_Wrapper.o $(ECOMMON)
- @echo -e "\t(EPIPHANY) LINK\t$@"
- @$(CC) -o $@ $^ $(LFLAGS)
+@@ELF_RULES@@
+#$(EDEST)/%.elf: $(EDEST)/%.o $(ECOMMON)
+# @$(ECHO) "\t(EPIPHANY) LINK\t$@"
+# @$(CC) -o $@ $^ $(LFLAGS)
$(EDEST)/%.o: $(ESRC)/%.c
$(EDEST)/%.o: $(ESRC)/%.c
- @
echo -e "\t(EPIPHANY) CC
\t$@"
+ @
$(ECHO) "\t(EPIPHANY) CC\t
\t$@"
@$(CC) $(CFLAGS) -c -o $@ $^
$(EDEST)/%.o: $(ELIB)/%.c
@$(CC) $(CFLAGS) -c -o $@ $^
$(EDEST)/%.o: $(ELIB)/%.c
- @
echo -e "\t(EPIPHANY) CC
\t$@"
+ @
$(ECHO) "\t(EPIPHANY) CC\t
\t$@"
@$(CC) $(CFLAGS) -c -o $@ $^
@$(CC) $(CFLAGS) -c -o $@ $^