summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBert Lange <b.lange@hzdr.de>2012-02-22 11:13:34 +0100
committerBert Lange <b.lange@hzdr.de>2012-02-22 11:13:34 +0100
commitc1331dc3a616a51e9ef8d81e4bc4afdb7bf2f133 (patch)
tree6c5eec12e5d636e61659592ef79cb42e075b645c
parent8b6ba55effe041027e4f156a54dcbefdaf69a2e2 (diff)
downloadzpu-c1331dc3a616a51e9ef8d81e4bc4afdb7bf2f133.zip
zpu-c1331dc3a616a51e9ef8d81e4bc4afdb7bf2f133.tar.gz
change: ignore lines with # in vhdl_files.txt
-rw-r--r--hw_s3estarter/bsp_zpuahb/simulation/Makefile2
-rw-r--r--hw_sp605/bsp_zpuahb/simulation/Makefile4
-rw-r--r--hw_v5_fx30t_extension/simulation/Makefile4
-rw-r--r--pr_maschinen_interlock/simulation/Makefile4
-rw-r--r--rena3/simulation/Makefile2
-rw-r--r--rena3/synthesis/Makefile2
-rw-r--r--sfp_sender/simulation/Makefile2
-rw-r--r--sfp_sender/synthesis/Makefile2
-rw-r--r--test_rrobin_problem/simulation/Makefile4
-rw-r--r--test_rrobin_problem/synthesis/Makefile2
-rw-r--r--zpu/simulation/Makefile2
11 files changed, 15 insertions, 15 deletions
diff --git a/hw_s3estarter/bsp_zpuahb/simulation/Makefile b/hw_s3estarter/bsp_zpuahb/simulation/Makefile
index 67f42a7..0f62d77 100644
--- a/hw_s3estarter/bsp_zpuahb/simulation/Makefile
+++ b/hw_s3estarter/bsp_zpuahb/simulation/Makefile
@@ -12,7 +12,7 @@ software_dir = ../software/test
VMK = vmk
# generate list of used libs
-library_list = $(shell cut vhdl_files.txt --field 1 --delimiter=' ' | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
diff --git a/hw_sp605/bsp_zpuahb/simulation/Makefile b/hw_sp605/bsp_zpuahb/simulation/Makefile
index ad87e1e..39c0b6f 100644
--- a/hw_sp605/bsp_zpuahb/simulation/Makefile
+++ b/hw_sp605/bsp_zpuahb/simulation/Makefile
@@ -14,7 +14,7 @@ software_dir = ../software
VMK = vmk
# generate list of used libs
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
all: compile simulate
@@ -39,7 +39,7 @@ clean:
rm -f *.wlf
rm -f wlf*
@#
- make -f Makefile.msim clean
+ -make -f Makefile.msim clean
rm -f Makefile.msim
rm -f .stamp
rm -rf $(library_list)
diff --git a/hw_v5_fx30t_extension/simulation/Makefile b/hw_v5_fx30t_extension/simulation/Makefile
index 8aea9cf..e1185a8 100644
--- a/hw_v5_fx30t_extension/simulation/Makefile
+++ b/hw_v5_fx30t_extension/simulation/Makefile
@@ -8,7 +8,7 @@
library = work
top = top
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
# http://sourceforge.net/projects/vmk/
VMK = vmk
@@ -31,7 +31,7 @@ clean:
rm -f *.wlf
rm -f wlf*
@#
- make -f Makefile.msim clean
+ -make -f Makefile.msim clean
rm -f Makefile.msim
rm -f .stamp
rm -rf $(library_list)
diff --git a/pr_maschinen_interlock/simulation/Makefile b/pr_maschinen_interlock/simulation/Makefile
index 458d46b..44871c2 100644
--- a/pr_maschinen_interlock/simulation/Makefile
+++ b/pr_maschinen_interlock/simulation/Makefile
@@ -3,7 +3,7 @@ library = work
top = system_tb
#top = channel_tb
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
# http://sourceforge.net/projects/vmk/
VMK = vmk
@@ -24,7 +24,7 @@ clean:
rm -f *.wlf
rm -f wlf*
@# vmk stuff
- make -f Makefile.msim clean
+ -make -f Makefile.msim clean
rm -f Makefile.msim
rm -rf $(library_list)
diff --git a/rena3/simulation/Makefile b/rena3/simulation/Makefile
index 1fdfd4e..83ca13e 100644
--- a/rena3/simulation/Makefile
+++ b/rena3/simulation/Makefile
@@ -15,7 +15,7 @@ software_dir = ../software
VMK = vmk
# generate list of used libs
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
all: compile simulate
diff --git a/rena3/synthesis/Makefile b/rena3/synthesis/Makefile
index 8a2008d..f8ef3ba 100644
--- a/rena3/synthesis/Makefile
+++ b/rena3/synthesis/Makefile
@@ -119,7 +119,7 @@ $(MODULE).prj: ../simulation/vhdl_files.txt
#############################################################################
### generate project file
###
- grep --invert rtl_tb ../simulation/vhdl_files.txt | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
+ grep --invert rtl_tb ../simulation/vhdl_files.txt | grep --invert "\#" | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
xst: $(MODULE).ngc
diff --git a/sfp_sender/simulation/Makefile b/sfp_sender/simulation/Makefile
index 50bfac9..b272807 100644
--- a/sfp_sender/simulation/Makefile
+++ b/sfp_sender/simulation/Makefile
@@ -14,7 +14,7 @@ software_dir = ../software
VMK = vmk
# generate list of used libs
-library_list = $(shell cut vhdl_files.txt --field 1 --delimiter=' ' | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
diff --git a/sfp_sender/synthesis/Makefile b/sfp_sender/synthesis/Makefile
index 9c7df12..d95ae96 100644
--- a/sfp_sender/synthesis/Makefile
+++ b/sfp_sender/synthesis/Makefile
@@ -119,7 +119,7 @@ $(MODULE).prj: ../simulation/vhdl_files.txt
#############################################################################
### generate project file
###
- grep --invert rtl_tb ../simulation/vhdl_files.txt | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
+ grep --invert rtl_tb ../simulation/vhdl_files.txt | grep --invert "\#" | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
xst: $(MODULE).ngc
diff --git a/test_rrobin_problem/simulation/Makefile b/test_rrobin_problem/simulation/Makefile
index c940fd7..9ed290d 100644
--- a/test_rrobin_problem/simulation/Makefile
+++ b/test_rrobin_problem/simulation/Makefile
@@ -15,7 +15,7 @@ software_dir = ../software
VMK = vmk
# generate list of used libs
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
all: compile simulate
@@ -40,7 +40,7 @@ clean:
rm -f *.wlf
rm -f wlf*
@# vmk stuff
- make -f Makefile.msim clean
+ -make -f Makefile.msim clean
rm -f Makefile.msim
rm -rf $(library_list)
diff --git a/test_rrobin_problem/synthesis/Makefile b/test_rrobin_problem/synthesis/Makefile
index 5a6473d..5abab75 100644
--- a/test_rrobin_problem/synthesis/Makefile
+++ b/test_rrobin_problem/synthesis/Makefile
@@ -119,7 +119,7 @@ $(MODULE).prj: ../simulation/vhdl_files.txt
#############################################################################
### generate project file
###
- grep --invert rtl_tb ../simulation/vhdl_files.txt | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
+ grep --invert rtl_tb ../simulation/vhdl_files.txt | grep --invert "\#" | awk '{printf "vhdl %s %s\n",$$1,$$2}' > $(MODULE).prj
xst: $(MODULE).ngc
diff --git a/zpu/simulation/Makefile b/zpu/simulation/Makefile
index 0e22f35..b1a7903 100644
--- a/zpu/simulation/Makefile
+++ b/zpu/simulation/Makefile
@@ -5,7 +5,7 @@ library = zpu
VMK = vmk
# generate list of used libs
-library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | sort --unique)
+library_list = $(shell cut --field 1 --delimiter=" " --only-delimited vhdl_files.txt | grep --invert "\#" | sort --unique)
help:
OpenPOWER on IntegriCloud