From d6df4798705872d65ca8936e7ef81ff648f2b0c4 Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Tue, 14 Jul 2015 16:13:32 -0700 Subject: [PATCH] move 'include /Makefrag' out of top-level Makefrag --- Makefrag | 2 -- fsim/Makefile | 1 + vsim/Makefile | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefrag b/Makefrag index c6ec4e66..57767e9f 100644 --- a/Makefrag +++ b/Makefrag @@ -1,5 +1,3 @@ --include $(generated_dir)/Makefrag - # check RISCV environment variable ifndef RISCV $(error Please set environment variable RISCV. Please take a look at README) diff --git a/fsim/Makefile b/fsim/Makefile index ad8ab8e0..4540fa74 100644 --- a/fsim/Makefile +++ b/fsim/Makefile @@ -20,6 +20,7 @@ CONFIG ?= DefaultFPGAConfig include $(base_dir)/Makefrag include $(sim_dir)/Makefrag +-include $(generated_dir)/Makefrag include $(base_dir)/vsim/Makefrag-sim all: $(simv) diff --git a/vsim/Makefile b/vsim/Makefile index c15e704d..0dff8b97 100644 --- a/vsim/Makefile +++ b/vsim/Makefile @@ -20,6 +20,7 @@ CONFIG ?= DefaultVLSIConfig include $(base_dir)/Makefrag include $(sim_dir)/Makefrag +-include $(generated_dir)/Makefrag include $(base_dir)/vsim/Makefrag-sim all: $(simv)