From 272d7f0f7db2e21f8892bcf3b267dba2d39fc4b9 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sun, 21 Mar 2021 18:16:11 +0000
Subject: [PATCH] - fixed ghdl.mk - fixed fir_parallel Makefile

git-svn-id: http://moon:8086/svn/vhdl/trunk@1439 cc03376c-175c-47c8-b038-4cd826a8556b
---
 Common/make/ghdl.mk                      |  6 +-
 projects/radio/sim/Makefile.fir_parallel | 73 +++++++-----------------
 2 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/Common/make/ghdl.mk b/Common/make/ghdl.mk
index 9e32ab4..42f40bd 100644
--- a/Common/make/ghdl.mk
+++ b/Common/make/ghdl.mk
@@ -12,6 +12,9 @@ LANG_STD ?= 93c
 IEEE_STD ?= standard
 RUN_TIME ?= 1000ns
 
+# Build path
+BUILD_DIR := build/$(TARGET)
+
 # Can be pre-initialized by user
 RUN_OPTS += --stop-time=$(RUN_TIME)
 GHDL_OPTS += --work=$(WORK_LIB) --workdir=$(BUILD_DIR)/$(WORK_DIR) --std=$(LANG_STD) --ieee=$(IEEE_STD)
@@ -22,9 +25,6 @@ GHDL_OPTS += --work=$(WORK_LIB) --workdir=$(BUILD_DIR)/$(WORK_DIR) --std=$(LANG_
 GHDL := ghdl
 GHDL_GCC := ghdl-gcc
 
-# Build path
-BUILD_DIR := build/$(TARGET)
-
 # Output stuff
 SIM_FILE-$(WITH_VCD) := $(BUILD_DIR)/$(TARGET).vcd
 SIM_FILE-$(WITH_FST) := $(BUILD_DIR)/$(TARGET).fst
diff --git a/projects/radio/sim/Makefile.fir_parallel b/projects/radio/sim/Makefile.fir_parallel
index a1626e8..dee5d67 100644
--- a/projects/radio/sim/Makefile.fir_parallel
+++ b/projects/radio/sim/Makefile.fir_parallel
@@ -3,61 +3,32 @@
 # -------------------------------------------------
 LANG_STD := 93c
 IEEE_STD := standard
-WORK_PATH := work
-SOURCE_PATH := ../src
-LIB_PATH := ../../../lib
+WORK_DIR := work
+WORK_LIB := work
 
 # -------------------------------------------------
 # Target options
 # -------------------------------------------------
+LIB_PATH := ../../../lib
+
+SRCS :=	$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd \
+		$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd \
+		$(LIB_PATH)/misc/utils_pkg.vhd \
+		$(LIB_PATH)/fixed/fixed_util_pkg.vhd \
+		$(LIB_PATH)/filter/src/filter_pkg.vhd \
+		$(LIB_PATH)/filter/src/fir_pkg.vhd \
+		$(LIB_PATH)/filter/src/fir_stage_pkg.vhd \
+		$(LIB_PATH)/filter/src/fir_stage.vhd \
+		$(LIB_PATH)/filter/src/fir_parallel_pkg.vhd \
+		$(LIB_PATH)/filter/src/fir_parallel.vhd \
+		$(LIB_PATH)/filter/src/tb_fir_parallel.vhd 
+
+# -------------------------------------------------
+# Compile
 TARGET := tb_fir_parallel
+ENTITY := tb_fir_parallel
+WITH_GHW := y
+GHDL_OPTS := -P../../../Common/sim/ieee_proposed/modelsim/build/ghdl/ieee_proposed
 
-SOURCES :=	../../../lib/src/PCK_FIO-2002.7/PCK_FIO_1993.vhd \
-		../../../lib/src/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd \
-		../../../lib/src/fixed_ja/fixed_ja.vhd \
-		../../../lib/src/fixed_ja/fixed_ja_body.vhd \
-		../src/filter_pkg.vhd \
-		../src/fir_stage_pkg.vhd \
-		../src/fir_stage.vhd \
-		../src/fir_parallel_pkg.vhd \
-		../src/fir_parallel.vhd \
-		../src/tb_fir_parallel.vhd 
-
-# -------------------------------------------------
-GHDL_OPT := --workdir=$(WORK_PATH) --std=$(LANG_STD) --ieee=$(IEEE_STD)
-
-# -------------------------------------------------
-all: elaborate
-
-.PHONY: syntax
-syntax: 
-	ghdl -s $(GHDL_OPT) $(SOURCES)
-
-import:
-	ghdl -i $(GHDL_OPT) $(SOURCES)
-
-analyze: 
-	ghdl -a $(GHDL_OPT) $(SOURCES)
-
-anaborate:
-	ghdl -c $(GHDL_OPT) $(SOURCES) -e $(TARGET)
-
-makeunit: analyze
-	ghdl -m $(GHDL_OPT) $(TARGET)
-
-elaborate: analyze
-	ghdl -e $(GHDL_OPT) $(TARGET)
-
-run: elaborate
-	ghdl -r $(GHDL_OPT) $(TARGET) --vcd=$(TARGET).vcd --assert-level=error 
-
-show:  $(TARGET).vcd 
-	gtkwave $(TARGET).vcd $(TARGET).sav
-
-# -------------------------------------------------
-.PHONY: clean
-clean:
-	rm -rf $(TARGET)
-	cd $(WORK_PATH); rm -rf *.o *.cf
-	
+include ../../../Common/make/ghdl.mk
 # -------------------------------------------------