makefile_writer.py: prettier vhdl dependency rule generation

src/makefile_writer.py

@@ -443,7 +443,7 @@ VLOGCOMP_FLAGS := -intstyle default -incremental -initfile xilinxsim.ini """ + s
 """
         make_preambule_p2 = """## rules #################################
 sim: xilinxsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
-$(VERILOG_OBJ): $(VHDL_OBJ)
+$(VERILOG_OBJ): $(LIB_IND) xilinxsim.ini
 $(VHDL_OBJ): $(LIB_IND) xilinxsim.ini
 
 xilinxsim.ini: $(XILINX_INI_PATH)/xilinxsim.ini
@@ -530,10 +530,10 @@ isim.wdb
             self.write(" $(VLOGCOMP_FLAGS) ")
             #if isinstance(vl, SVFile):
             #    self.write(" -sv ")
-            incdir = "-i "
-            incdir += " -i ".join(vl.include_dirs)
-            incdir += " "
-            self.write(incdir)
+            #incdir = "-i "
+            #incdir += " -i ".join(vl.include_dirs)
+            #incdir += " "
+            self.write(" -i ".join(vl.include_dirs) + " ")
             self.writeln(vl.vlog_opt+" $<")
             self.write("\t\t@mkdir -p $(dir $@)")
             self.writeln(" && touch $@ \n\n")
@@ -556,12 +556,13 @@ isim.wdb
             #if len(vhdl.dep_depends_on) != 0:
             #self.writeln(".PHONY: " + os.path.join(lib, purename, "."+purename))
             # Touch the dependency file as well. In this way, "make" will recompile only what is needed (out of date)
-            self.write(os.path.join(lib, purename, "."+purename) +":")
-            for dep_file in vhdl.dep_depends_on:
-                name = dep_file.purename
-                self.write(" \\\n"+ os.path.join(dep_file.library, name, "."+name+ "_" + vhdl.extension()))
-            self.write('\n')
-            self.writeln("\t\t@mkdir -p $(dir $@) && touch $@\n")
+            if len(vhdl.dep_depends_on) != 0:
+                self.write(os.path.join(lib, purename, "."+purename) +":")
+                for dep_file in vhdl.dep_depends_on:
+                    name = dep_file.purename
+                    self.write(" \\\n"+ os.path.join(dep_file.library, name, "."+name+ "_" + vhdl.extension()))
+                self.write('\n')
+                self.writeln("\t\t@mkdir -p $(dir $@) && touch $@\n")
 
     def __get_rid_of_incdirs(self, vlog_opt):
         vlog_opt_vsim = self.__get_rid_of_vsim_incdirs(vlog_opt)