progs: Makefile adjustments

diff --git a/progs/Makefile b/progs/Makefile
index 92c3c9e9d585d2e2cb50f2a89f11f65b9b38c1fb..aee627591dc3917203047c9402af9c79c0605204 100644 (file)
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 HN := $(shell hostname)
 TILABHOSTS := $(shell echo ti{1..41}) apps1
 
 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
 
 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
 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
 
 DPROGFLAGS := -d /dev/ttyUSB0 -b 115200
 endif
 endif
 

+

 all: fibmmem.prog
 
 %.s_pre: %.s dt_inc.s
 all: fibmmem.prog
 
 %.s_pre: %.s dt_inc.s


@@ -25,8 +25,9 @@ all: fibmmem.prog
        @echo "  ASM    $<"
        ../3a_asm/dtas < $< > $@
 
        @echo "  ASM    $<"
        ../3a_asm/dtas < $< > $@
 

-# no real file

 fibmmem.prog:
 fibmmem.prog:

+testbench.prog:
+deepjit.prog:

 %.prog: %.dthex
        @echo "  PROG   $<"
        ../tools/dtprog.py $< $(DPROGFLAGS) 
 %.prog: %.dthex
        @echo "  PROG   $<"
        ../tools/dtprog.py $< $(DPROGFLAGS) 


@@ -40,10 +41,16 @@ fibmmem.prog:
        ../3a_asm/dtas < $< > $@
 
 fibmmem.sim:
        ../3a_asm/dtas < $< > $@
 
 fibmmem.sim:

+testbench.sim:
+deepjit.sim:

 %.sim: %.dthex_sim
        @echo "  SIM    $<"
        cd ../3b_sim/; ./sim -f ../progs/$<
 
 %.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
 clean:
        rm -rf *.dthex *.s_pre *.dthex_sim *.s_pre_sim

+
+buildtools:
+       make -C ../3a_asm
+       make -C ../3b_sim