From: Bernhard Urban <lewurm@gmail.com>
Date: Thu, 13 Jan 2011 22:20:47 +0000 (+0100)
Subject: progs: Makefile adjustments
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=commitdiff_plain;h=2c106febdc5883442ffc4341933e1bd23829df4a

progs: Makefile adjustments
---

diff --git a/progs/Makefile b/progs/Makefile
index 92c3c9e..aee6275 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 HN := $(shell hostname)
 TILABHOSTS := $(shell echo ti{1..41}) apps1
-STEFANHOST := $(shell echo ubuntu) apps1
+STEFANHOST := ubuntu
 
 ifeq ($(findstring $(HN), $(TILABHOSTS)), $(HN))
 DPROGFLAGS := -d /dev/ttyS0 -b 9600
@@ -10,11 +10,11 @@ else
 ifeq ($(findstring $(HN), $(STEFANHOST)), $(HN))
 DPROGFLAGS := -d /dev/ttyS0 -b 115200
 else
-# TODO: passt das fuern stefan auch?
 DPROGFLAGS := -d /dev/ttyUSB0 -b 115200
 endif
 endif
 
+
 all: fibmmem.prog
 
 %.s_pre: %.s dt_inc.s
@@ -25,8 +25,9 @@ all: fibmmem.prog
 	@echo "  ASM    $<"
 	../3a_asm/dtas < $< > $@
 
-# no real file
 fibmmem.prog:
+testbench.prog:
+deepjit.prog:
 %.prog: %.dthex
 	@echo "  PROG   $<"
 	../tools/dtprog.py $< $(DPROGFLAGS) 
@@ -40,10 +41,16 @@ fibmmem.prog:
 	../3a_asm/dtas < $< > $@
 
 fibmmem.sim:
+testbench.sim:
+deepjit.sim:
 %.sim: %.dthex_sim
 	@echo "  SIM    $<"
 	cd ../3b_sim/; ./sim -f ../progs/$<
 
-.PHONY: clean
+.PHONY: clean buildtools
 clean:
 	rm -rf *.dthex *.s_pre *.dthex_sim *.s_pre_sim
+
+buildtools:
+	make -C ../3a_asm
+	make -C ../3b_sim