From 0047d327555169f2b9cd7bb921ed461c946aea37 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sun, 21 Mar 2021 16:02:35 +0000
Subject: [PATCH] - improved

git-svn-id: http://moon:8086/svn/vhdl/trunk@1433 cc03376c-175c-47c8-b038-4cd826a8556b
---
 Common/make/ghdl.mk      | 17 ++++++++++++-----
 projects/cordic/Makefile |  5 ++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Common/make/ghdl.mk b/Common/make/ghdl.mk
index 74507a6..9e32ab4 100644
--- a/Common/make/ghdl.mk
+++ b/Common/make/ghdl.mk
@@ -1,8 +1,9 @@
 # -------------------------------------------------
-# Global options
+# User options
 # -------------------------------------------------
 # SRCS
 # WITH_VCD
+# WITH_GHW
 TARGET ?= default
 ENTITY ?= default
 WORK_DIR ?= work
@@ -11,11 +12,20 @@ LANG_STD ?= 93c
 IEEE_STD ?= standard
 RUN_TIME ?= 1000ns
 
+# 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)
+
+# -------------------------------------------------
+
+# GHDL binary
 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
 SIM_FILE-$(WITH_GHW) := $(BUILD_DIR)/$(TARGET).ghw
@@ -24,10 +34,7 @@ GTK_OPTS-$(WITH_VCD) := --vcd=$(SIM_FILE-y)
 GTK_OPTS-$(WITH_FST) := --fst=$(SIM_FILE-y)
 GTK_OPTS-$(WITH_GHW) := --wave=$(SIM_FILE-y)
 
-
-RUN_OPTS := --stop-time=$(RUN_TIME)
-GHDL_OPTS := --work=$(WORK_LIB) --workdir=$(BUILD_DIR)/$(WORK_DIR) --std=$(LANG_STD) --ieee=$(IEEE_STD)
-
+# Targets
 all:  analyze
 
 $(BUILD_DIR)/$(WORK_DIR):
diff --git a/projects/cordic/Makefile b/projects/cordic/Makefile
index 4b507ff..8f2501d 100644
--- a/projects/cordic/Makefile
+++ b/projects/cordic/Makefile
@@ -12,7 +12,8 @@ WORK_LIB := work
 # -------------------------------------------------
 TARGET := tb_cordic_top
 
-SRCS := ../../lib/fixed/fixed_util_pkg.vhd
+SRCS := ../../lib/fixed_ja/fixed_ja.vhd
+SRCS += ../../lib/fixed_ja/fixed_ja_body.vhd
 SRCS += ../../lib/PCK_FIO-2002.7/PCK_FIO_1993.vhd
 SRCS += ../../lib/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
 
@@ -24,8 +25,6 @@ SRCS +=	src/cordic_pkg.vhd \
 			src/cordic_top.vhd \
 			src/tb_cordic_top.vhd 
 
-			
-			
 # -------------------------------------------------
 # Compile
 ENTITY := tb_cordic_top