sort out Makefile for building

diff --git a/ls180/Makefile b/ls180/Makefile
index 66c70a22e8ef1e57493e9a040b6552e98312e060..adfd328dbfe8d460ce71e1287b2e19cd80ef2d78 100644 (file)
--- a/ls180/Makefile
+++ b/ls180/Makefile
@@ -1,24 +1,20 @@
-.PHONY: all
+.PHONY: all corona prepare cocotb
 
-# for running VASY in coriolis2 chroot.  setup:
-# https://git.libre-soc.org/?p=dev-env-setup.git;a=blob;f=coriolis2-chroot;hb=HEAD
-VASY ?= schroot -c coriolis -d /tmp /home/lkcl/alliance/install/bin/vasy
+all: prepare cocotb
 
-nsxlib_vbe=$(wildcard *.vbe)
-nsxlib_vst=$(patsubst %.vbe,%.vhd,$(wildcard *.vhd))
 
-SPOT=$(addsuffix .vbe, $(basename $(wildcard *.vhd)))
+# gets the nsxlib and niolib files, and munges the contents of vst_src
+prepare:
+       ./vbe2vst.py
+       ./vst_correct.py
 
-%.vbe : %.vhd 
-       $(VASY) -s -I vbe $^ -o $@
-       mv $@.vhd $@
-
-all : $(nsxlib_vst)
-       echo $(SPOT)
-       echo $(nsxlib_vbe)
-       echo $(nsxlib_vst)
+# runs cocotb test
+cocotb:
+       (cd cocotb && ./run_ghdl.sh)
 
+# builds just for fun (double-check) ghdl works
 corona:
+       ./vhd2obj.py
        (cd obj && ghdl -e -g --std=08 corona)
        (cd obj && ghdl -r -g --std=08 corona)
 

diff --git a/ls180/vbe2vst.py b/ls180/vbe2vst.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ls180/vhd2obj.py b/ls180/vhd2obj.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ls180/vst_correct.py b/ls180/vst_correct.py
old mode 100644 (file)
new mode 100755 (executable)