Commit 99f1e918 authored by Tristan Gingold's avatar Tristan Gingold

makefile.py: remove generated extra spaces.

parent 4468bbdc
...@@ -105,7 +105,7 @@ class ToolMakefile(object): ...@@ -105,7 +105,7 @@ class ToolMakefile(object):
def _makefile_sim_file_touch_stamp(self): def _makefile_sim_file_touch_stamp(self):
self.write("\t\t@" + shell.mkdir_command() + " $(dir $@)") self.write("\t\t@" + shell.mkdir_command() + " $(dir $@)")
self.writeln(" && " + shell.touch_command() + " $@ \n") self.writeln(" && " + shell.touch_command() + " $@\n")
def makefile_check_tool(self, path_key): def makefile_check_tool(self, path_key):
"""Check if the binary is available in the O.S. environment""" """Check if the binary is available in the O.S. environment"""
......
...@@ -105,7 +105,7 @@ class MakefileVsim(MakefileSim): ...@@ -105,7 +105,7 @@ class MakefileVsim(MakefileSim):
self.writeln( self.writeln(
"simulation: %s $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)" % "simulation: %s $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)" %
(' '.join(self.additional_deps)),) (' '.join(self.additional_deps)),)
self.writeln("$(VERILOG_OBJ) : " + ' '.join(self.additional_deps)) self.writeln("$(VERILOG_OBJ): " + ' '.join(self.additional_deps))
self.writeln("$(VHDL_OBJ): $(LIB_IND) " + ' '.join(self.additional_deps)) self.writeln("$(VHDL_OBJ): $(LIB_IND) " + ' '.join(self.additional_deps))
self.writeln() self.writeln()
for filename, filesource in six.iteritems(self.copy_rules): for filename, filesource in six.iteritems(self.copy_rules):
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,13 +25,13 @@ simulation: $(VERILOG_OBJ) $(VHDL_OBJ) ...@@ -25,13 +25,13 @@ simulation: $(VERILOG_OBJ) $(VHDL_OBJ)
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
$(GHDL) -a --work=work $(GHDL_OPT) $< $(GHDL) -a --work=work $(GHDL_OPT) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
work/gate3/.gate3_vhd: ../files/gate3.vhd \ work/gate3/.gate3_vhd: ../files/gate3.vhd \
work/gate/.gate_vhdl work/gate/.gate_vhdl
$(GHDL) -a --work=work $(GHDL_OPT) $< $(GHDL) -a --work=work $(GHDL_OPT) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -41,7 +41,7 @@ work/.work: ...@@ -41,7 +41,7 @@ work/.work:
work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd
vlogcomp -work work=./work $(VLOGCOMP_FLAGS) -i ../files $< vlogcomp -work work=./work $(VLOGCOMP_FLAGS) -i ../files $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
......
...@@ -26,7 +26,7 @@ include_dirs: ...@@ -26,7 +26,7 @@ include_dirs:
work/gate2/.gate2_v: ../files/gate2.v work/gate2/.gate2_v: ../files/gate2.v
echo $< >> run.command echo $< >> run.command
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -24,7 +24,7 @@ LIBS := work ...@@ -24,7 +24,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : $(VERILOG_OBJ):
$(VHDL_OBJ): $(LIB_IND) $(VHDL_OBJ): $(LIB_IND)
work/.work: work/.work:
...@@ -32,7 +32,7 @@ work/.work: ...@@ -32,7 +32,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -19,7 +19,7 @@ simulation: $(VERILOG_OBJ) $(VHDL_OBJ) ...@@ -19,7 +19,7 @@ simulation: $(VERILOG_OBJ) $(VHDL_OBJ)
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
xvhdl $< xvhdl $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -36,7 +36,7 @@ work/.work: ...@@ -36,7 +36,7 @@ work/.work:
work/vlog/.vlog_v: vlog.v \ work/vlog/.vlog_v: vlog.v \
macros.v macros.v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -36,7 +36,7 @@ work/.work: ...@@ -36,7 +36,7 @@ work/.work:
work/vlog/.vlog_v: vlog.v \ work/vlog/.vlog_v: vlog.v \
inc/macros.v inc/macros.v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -27,7 +27,7 @@ LIBS := work ...@@ -27,7 +27,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -38,12 +38,12 @@ work/.work: ...@@ -38,12 +38,12 @@ work/.work:
work/gate/.gate_vhdl: gate.vhdl \ work/gate/.gate_vhdl: gate.vhdl \
work/pkg/.pkg_vhdl work/pkg/.pkg_vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
work/pkg/.pkg_vhdl: pkg.vhdl work/pkg/.pkg_vhdl: pkg.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -27,7 +27,7 @@ LIBS := work ...@@ -27,7 +27,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -37,7 +37,7 @@ work/.work: ...@@ -37,7 +37,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -28,7 +28,7 @@ LIBS := work ...@@ -28,7 +28,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -38,7 +38,7 @@ work/.work: ...@@ -38,7 +38,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -27,7 +27,7 @@ LIBS := work ...@@ -27,7 +27,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -37,13 +37,13 @@ work/.work: ...@@ -37,13 +37,13 @@ work/.work:
work/pkg/.pkg_sv: pkg.sv work/pkg/.pkg_sv: pkg.sv
vlog -work work $(VLOG_FLAGS) -sv $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) -sv $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
work/vlog/.vlog_sv: vlog.sv \ work/vlog/.vlog_sv: vlog.sv \
work/pkg/.pkg_sv work/pkg/.pkg_sv
vlog -work work $(VLOG_FLAGS) -sv $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) -sv $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work\.work LIB_IND := work\.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work\.work: ...@@ -35,7 +35,7 @@ work\.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir $(dir $@) && type nul >> $@ @mkdir $(dir $@) && type nul >> $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -41,7 +41,7 @@ work\.work: ...@@ -41,7 +41,7 @@ work\.work:
work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd
vlogcomp -work work=.\work $(VLOGCOMP_FLAGS) -i ../files $< vlogcomp -work work=.\work $(VLOGCOMP_FLAGS) -i ../files $<
@mkdir $(dir $@) && type nul >> $@ @mkdir $(dir $@) && type nul >> $@
......
...@@ -41,7 +41,7 @@ work/.work: ...@@ -41,7 +41,7 @@ work/.work:
work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd work/gate3_tb/.gate3_tb_v: ../files/gate3_tb.v ../files/gate3.vhd
vlogcomp -work work=./work $(VLOGCOMP_FLAGS) -i ../files $< vlogcomp -work work=./work $(VLOGCOMP_FLAGS) -i ../files $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate_tb/.gate_tb_v: ../files/gate_tb.v work/gate_tb/.gate_tb_v: ../files/gate_tb.v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/vlog/.vlog_v: vlog.v work/vlog/.vlog_v: vlog.v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -27,7 +27,7 @@ LIBS := work ...@@ -27,7 +27,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -37,13 +37,13 @@ work/.work: ...@@ -37,13 +37,13 @@ work/.work:
work/mod_a/.mod_a_v: mod_a.v work/mod_a/.mod_a_v: mod_a.v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
work/vlog/.vlog_v: vlog.v \ work/vlog/.vlog_v: vlog.v \
work/mod_a/.mod_a_v work/mod_a/.mod_a_v
vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $< vlog -work work $(VLOG_FLAGS) $(INCLUDE_DIRS) $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -28,7 +28,7 @@ include_dirs: ...@@ -28,7 +28,7 @@ include_dirs:
work/vlog/.vlog_v: vlog.v \ work/vlog/.vlog_v: vlog.v \
inc/macros.v inc/macros.v
echo $< >> run.command echo $< >> run.command
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -25,7 +25,7 @@ LIBS := work ...@@ -25,7 +25,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -35,7 +35,7 @@ work/.work: ...@@ -35,7 +35,7 @@ work/.work:
work/gate/.gate_vhdl: ../files/gate.vhdl work/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -27,7 +27,7 @@ LIBS := sublib work ...@@ -27,7 +27,7 @@ LIBS := sublib work
LIB_IND := sublib/.sublib work/.work LIB_IND := sublib/.sublib work/.work
simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ) simulation: modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ) : modelsim.ini $(VERILOG_OBJ): modelsim.ini
$(VHDL_OBJ): $(LIB_IND) modelsim.ini $(VHDL_OBJ): $(LIB_IND) modelsim.ini
modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini modelsim.ini: $(MODELSIM_INI_PATH)/modelsim.ini
...@@ -41,12 +41,12 @@ work/.work: ...@@ -41,12 +41,12 @@ work/.work:
work/gate3/.gate3_vhd: gate3.vhd \ work/gate3/.gate3_vhd: gate3.vhd \
sublib/gate/.gate_vhdl sublib/gate/.gate_vhdl
vcom $(VCOM_FLAGS) -work work $< vcom $(VCOM_FLAGS) -work work $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
sublib/gate/.gate_vhdl: ../files/gate.vhdl sublib/gate/.gate_vhdl: ../files/gate.vhdl
vcom $(VCOM_FLAGS) -work sublib $< vcom $(VCOM_FLAGS) -work sublib $<
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
# USER SIM COMMANDS # USER SIM COMMANDS
......
...@@ -29,7 +29,7 @@ LIBS := work ...@@ -29,7 +29,7 @@ LIBS := work
LIB_IND := work/.work LIB_IND := work/.work