diff --git a/projects/eval_fixed_ja/Makefile b/projects/eval_fixed_ja/Makefile
index 218643e..514f966 100644
--- a/projects/eval_fixed_ja/Makefile
+++ b/projects/eval_fixed_ja/Makefile
@@ -3,48 +3,22 @@
 # -------------------------------------------------
 LANG_STD := 93c
 IEEE_STD := standard
-WORK_PATH := work
-SOURCE_PATH := src
-LIB_PATH := ../lib
+WORK_DIR := work
+WORK_LIB := work
 
 # -------------------------------------------------
 # Target options
 # -------------------------------------------------
+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
+SRCS += src/tb_eval_fixed_ja.vhd
+
+# -------------------------------------------------
+# Compile
 TARGET := tb_eval_fixed_ja
-SOURCES := 
+ENTITY := tb_eval_fixed_ja
+WITH_GHW := y
 
-# -------------------------------------------------
-GHDL_OPT := --workdir=$(WORK_PATH) --std=$(LANG_STD) --ieee=$(IEEE_STD)
-
-# -------------------------------------------------
-all: elaborate
-
-.PHONY: syntax
-syntax: 
-	ghdl -s $(GHDL_OPT) $(SOURCE_PATH)/*.vhd
-
-import:
-	ghdl -i $(GHDL_OPT) $(LIB_PATH)/*.vhd
-
-analyze: import
-	ghdl -a $(GHDL_OPT) $(LIB_PATH)/*.vhd $(SOURCE_PATH)/*.vhd
-
-anaborate: import
-	ghdl -c $(GHDL_OPT) $(LIB_PATH)/*.vhd $(SOURCE_PATH)/*.vhd -e $(TARGET)
-
-makeunit: import
-	ghdl -m $(GHDL_OPT) $(TARGET)
-
-elaborate: analyze
-	ghdl -e $(GHDL_OPT) $(TARGET)
-
-run: elaborate
-	ghdl -r $(GHDL_OPT) $(TARGET)
-
-# -------------------------------------------------
-.PHONY: clean
-clean:
-	rm -rf $(TARGET)
-	cd $(WORK_PATH); rm -rf *.o *.cf
-	
-# -------------------------------------------------
+include ../../Common/make/ghdl.mk