X-Git-Url: http://sraa.de/git/?a=blobdiff_plain;f=dol%2Fsrc%2Fdol%2Fvisitor%2Fepiphany%2Ftemplate%2FMakefile;h=4c6b2e127e0b87150d69f291488d5cbb92e4aed8;hb=370edfa29d31aae850477190474a3e4c81b2b77b;hp=90cc3bf2c6cb7073f20a33bfb9b343343a5d6440;hpb=2858109405a90a4d9df149b10444678d42e41c59;p=jump.git

diff --git a/dol/src/dol/visitor/epiphany/template/Makefile b/dol/src/dol/visitor/epiphany/template/Makefile
index 90cc3bf..4c6b2e1 100644
--- a/dol/src/dol/visitor/epiphany/template/Makefile
+++ b/dol/src/dol/visitor/epiphany/template/Makefile
@@ -12,20 +12,11 @@ ESRC	:= esrc
 EDEST	:= eobj
 ELIB	:= lib
 
-# Host application and host objects
-HOSTAPP	= $(DEST)/ep_application
-HOBJS	= $(HDEST)/main.o
-
-# 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
 CC	= e-gcc
 OBJCOPY	= e-objcopy
 CFLAGS	= -Os -std=c99 -Ilib -falign-loops=8 -falign-functions=8 -Wall
-LFLAGS	= -T$(EPIPHANY_HOME)/bsps/current/fast.ldf -le-lib
+LFLAGS	= -T$(EPIPHANY_HOME)/bsps/current/fast.ldf -le-lib -lm
 OCFLAGS	= -R .shared_dram -R .data_bank3
 
 # Host build flags
@@ -33,48 +24,58 @@ HOSTCC	= gcc
 HCFLAGS	= -O2 -std=c99 -I$(EPIPHANY_HOME)/tools/host/include -Wall
 HLFLAGS	= -L$(EPIPHANY_HOME)/tools/host/lib -le-hal
 
-# Global rules
+# Host application and host objects
+HOSTAPP	= $(DEST)/ep_application
+HOBJS	= $(HDEST)/main.o
+
+# Epiphany applications and common objects
+EPAPPS	= @@SREC_FILES@@
+ECOMMON	= $(EDEST)/dol.o $(EDEST)/ports.o $(EDEST)/index.o
+
+# ===========================================================================
+ECHO	= /bin/echo -e
 .SECONDARY:
 .PHONY: all run host cores clean
 all: run
 
 host: $(HOSTAPP)
 
-cores: $(ECOMMON) $(EWRAPPERS) $(EPAPPS)
+cores: $(ECOMMON) $(EPAPPS)
 
 run: host cores
-	@echo -e "\tRUN"
+	@$(ECHO) "\tRUN"
 	@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)
-	@echo -e "\t(HOST)     LINK\t$@"
+	@$(ECHO) "\t(HOST)     LINK\t$@"
 	@$(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
-	@echo -e "\t(EPIPHANY) OBJCOPY $@"
+	@$(ECHO) "\t(EPIPHANY) OBJCOPY\t$@"
 	@$(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
-	@echo -e "\t(EPIPHANY) CC\t$@"
+	@$(ECHO) "\t(EPIPHANY) CC\t\t$@"
 	@$(CC) $(CFLAGS) -c -o $@ $^
 
 $(EDEST)/%.o: $(ELIB)/%.c
-	@echo -e "\t(EPIPHANY) CC\t$@"
+	@$(ECHO) "\t(EPIPHANY) CC\t\t$@"
 	@$(CC) $(CFLAGS) -c -o $@ $^