From c5f0ed9c99b6a13c357435fa1f9c0085c5d3d8af Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 18 Dec 2006 20:05:02 +0000 Subject: [PATCH] Fix makefile typo, and remove unneeded PWD variable git-svn-id: file://localhost/svn/verilator/trunk/verilator@844 77ca24e4-aefa-0310-84f0-b9a241c72d87 --- test_c/Makefile | 3 +-- test_c/Makefile_obj | 2 +- test_regress/Makefile | 1 - test_regress/Makefile_obj | 2 +- test_sc/Makefile | 3 +-- test_sc/Makefile_obj | 2 +- test_sp/Makefile | 3 +-- test_sp/Makefile_obj | 2 +- test_vcs/Makefile | 3 +-- test_verilated/Makefile | 1 - test_verilated/Makefile_obj | 4 ++-- 11 files changed, 10 insertions(+), 16 deletions(-) diff --git a/test_c/Makefile b/test_c/Makefile index 173f73992..ee76758b0 100644 --- a/test_c/Makefile +++ b/test_c/Makefile @@ -15,7 +15,6 @@ # This must point to the root of the VERILATOR kit VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT -PWD := $(shell pwd) PERL = perl @@ -28,7 +27,7 @@ default: prep compile run debug: prep_dbg compile run valgrind: prep_vg compile run -VERILATOR_FLAGS = --cc -f $(PWD)/../test_v/input.vc top.v +VERILATOR_FLAGS = --cc -f $(VERILATOR_ROOT)/test_v/input.vc top.v #Note turning on traces requires SystemPerl to be installed #VERILATOR_FLAGS += --trace diff --git a/test_c/Makefile_obj b/test_c/Makefile_obj index 1445bbc2a..c394379fe 100644 --- a/test_c/Makefile_obj +++ b/test_c/Makefile_obj @@ -3,7 +3,7 @@ # # DESCRIPTION: Verilator Example: Makefile for inside object directory # -# This executed in the object directory, and called by ../Makefile +# This is executed in the object directory, and called by ../Makefile # # Copyright 2003-2006 by Wilson Snyder. This program is free software; you can # redistribute it and/or modify it under the terms of either the GNU diff --git a/test_regress/Makefile b/test_regress/Makefile index f5e0d81e5..0a6c42c2f 100644 --- a/test_regress/Makefile +++ b/test_regress/Makefile @@ -16,7 +16,6 @@ VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT PERL = perl -PWD := $(shell pwd) ###################################################################### diff --git a/test_regress/Makefile_obj b/test_regress/Makefile_obj index c465e0511..2a4f77fab 100644 --- a/test_regress/Makefile_obj +++ b/test_regress/Makefile_obj @@ -3,7 +3,7 @@ # # DESCRIPTION: Verilator Example: Makefile for inside object directory # -# This executed in the object directory, and called by ../Makefile +# This is executed in the object directory, and called by ../Makefile # # Copyright 2003-2005 by Wilson Snyder. This program is free software; you can # redistribute it and/or modify it under the terms of either the GNU diff --git a/test_sc/Makefile b/test_sc/Makefile index 9aaa1fee4..dd20a9463 100644 --- a/test_sc/Makefile +++ b/test_sc/Makefile @@ -15,7 +15,6 @@ # This must point to the root of the VERILATOR kit VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT -PWD := $(shell pwd) PERL = perl @@ -26,7 +25,7 @@ default: precopy prep preproc compile run debug: precopy prep_dbg preproc compile run nopublic: precopy prep_dbg_np preproc compile run -V_FLAGS = -f $(PWD)/../test_v/input.vc +V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc VERILATOR_FLAGS = --sc $(V_FLAGS) top.v precopy: obj_dir obj_dir/sc_main.cpp diff --git a/test_sc/Makefile_obj b/test_sc/Makefile_obj index 050db89ff..a68a0d274 100644 --- a/test_sc/Makefile_obj +++ b/test_sc/Makefile_obj @@ -3,7 +3,7 @@ # # DESCRIPTION: Verilator Example: Makefile for inside object directory # -# This executed in the object directory, and called by ../Makefile +# This is executed in the object directory, and called by ../Makefile # # Copyright 2003-2006 by Wilson Snyder. This program is free software; you can # redistribute it and/or modify it under the terms of either the GNU diff --git a/test_sp/Makefile b/test_sp/Makefile index ededf343f..9ce265e1d 100644 --- a/test_sp/Makefile +++ b/test_sp/Makefile @@ -15,7 +15,6 @@ # This must point to the root of the VERILATOR kit VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT -PWD := $(shell pwd) PERL = perl @@ -26,7 +25,7 @@ default: prep preproc compile run coverage debug: prep_dbg preproc compile_dbg run coverage nopublic: prep_dbg_np preproc compile_dbg run coverage -V_FLAGS = -f $(PWD)/../test_v/input.vc +V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc VERILATOR_FLAGS = --public --sp --coverage --stats --trace $(V_FLAGS) top.v prep: diff --git a/test_sp/Makefile_obj b/test_sp/Makefile_obj index 73830e5dc..3f73a9fa0 100644 --- a/test_sp/Makefile_obj +++ b/test_sp/Makefile_obj @@ -3,7 +3,7 @@ # # DESCRIPTION: Verilator Example: Makefile for inside object directory # -# This executed in the object directory, and called by ../Makefile +# This is executed in the object directory, and called by ../Makefile # # Copyright 2003-2006 by Wilson Snyder. This program is free software; you can # redistribute it and/or modify it under the terms of either the GNU diff --git a/test_vcs/Makefile b/test_vcs/Makefile index 70a8d4650..80ea32c0b 100644 --- a/test_vcs/Makefile +++ b/test_vcs/Makefile @@ -1,4 +1,4 @@ -# $Id:$ */ +# $Id$ */ #***************************************************************************** # # DESCRIPTION: Verilator Example: Makefile for inside source directory @@ -15,7 +15,6 @@ # This must point to the root of the VERILATOR kit VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT -PWD := $(shell pwd) ###################################################################### diff --git a/test_verilated/Makefile b/test_verilated/Makefile index 932455ba0..4b32a767b 100644 --- a/test_verilated/Makefile +++ b/test_verilated/Makefile @@ -16,7 +16,6 @@ VERILATOR_ROOT := $(shell pwd)/.. export VERILATOR_ROOT PERL = perl -PWD := $(shell pwd) VERILATOR_SW += ifeq ($(VERILATOR_NO_DEBUG),) diff --git a/test_verilated/Makefile_obj b/test_verilated/Makefile_obj index ac645f625..4f8638b78 100644 --- a/test_verilated/Makefile_obj +++ b/test_verilated/Makefile_obj @@ -1,9 +1,9 @@ -# $Id:$ -*- Makefile -*- +# $Id$ -*- Makefile -*- #***************************************************************************** # # DESCRIPTION: Verilator Example: Makefile for inside object directory # -# This executed in the object directory, and called by ../Makefile +# This is executed in the object directory, and called by ../Makefile # # Copyright 2003 by Wilson Snyder. This program is free software; you can # redistribute it and/or modify it under the terms of either the GNU