X-Git-Url: http://sraa.de/git/?a=blobdiff_plain;f=minidol%2FMakefile;h=12738f4a325d8bcc6771bdcacd5958aacdbb08a2;hb=cbc1f1265fd129d066da10e72e819d7d20f5360a;hp=698da9f67d90e0d325c2b9783a9fe26816bed0b5;hpb=b2bdc958aa205fbe90460a51e16082dc9f3f3cdc;p=jump.git

diff --git a/minidol/Makefile b/minidol/Makefile
index 698da9f..12738f4 100644
--- a/minidol/Makefile
+++ b/minidol/Makefile
@@ -14,31 +14,33 @@ ELIB	:= lib
 
 # Host application and host objects
 HOSTAPP	= $(DEST)/ep_application
-HOBJS	= $(HDEST)/buffers.o
+HOBJS	= $(HDEST)/main.o
 
 # Epiphany applications and common objects
-EPAPPS	= $(DEST)/Data_Generator.srec $(DEST)/Weight_Generator.srec
-ECOMMON	= $(EDEST)/dol.o
+EPAPPS	= $(DEST)/Gen.srec $(DEST)/Square.srec #$(DEST)/Beam_Former.srec
+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	= -O2 -falign-loops=8 -falign-functions=8 -Wall -Ilib
+CFLAGS	= -O2 -std=c99 -Ilib -falign-loops=8 -falign-functions=8 -Wall
 LFLAGS	= -T$(EPIPHANY_HOME)/bsps/current/fast.ldf -le-lib
 OCFLAGS	= -R .shared_dram -R .data_bank3
 
 # Host build flags
 HOSTCC	= gcc
-HCFLAGS	= -I$(EPIPHANY_HOME)/tools/host/include -std=c99 -Wall
+HCFLAGS	= -O2 -std=c99 -I$(EPIPHANY_HOME)/tools/host/include -Wall
 HLFLAGS	= -L$(EPIPHANY_HOME)/tools/host/lib -le-hal
 
 # Global rules
+.SECONDARY:
 .PHONY: all run host cores clean
 all: run
 
 host: $(HOSTAPP)
 
-cores: $(EPAPPS)
+cores: $(ECOMMON) $(EWRAPPERS) $(EPAPPS)
 
 run: host cores
 	@echo -e "\tRUN"
@@ -64,7 +66,7 @@ $(DEST)/%.srec: $(EDEST)/%.elf
 	@echo -e "\t(EPIPHANY) OBJCOPY $@"
 	@$(OBJCOPY) $(OCFLAGS) --output-target srec --srec-forceS3 $^ $@
 
-$(EDEST)/%.elf: $(ECOMMON) $(EDEST)/%.o
+$(EDEST)/%.elf: $(EDEST)/%.o $(EDEST)/%_Wrapper.o $(ECOMMON)
 	@echo -e "\t(EPIPHANY) LINK\t$@"
 	@$(CC) -o $@ $^ $(LFLAGS)