Fixed Makefile rules for generated share files

diff --git a/Makefile b/Makefile
index 300873803cb8458c6ca59ce8e04d5a80df28fb09..0aff340bde65a9e0a2ecd311a22f4d0cb1660cbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,6 +195,13 @@ $(subst //,/,$(1)/$(notdir $(2))): $(2)
        $$(Q) cp "$(YOSYS_SRC)"/$(2) $(subst //,/,$(1)/$(notdir $(2)))
 endef
 
+define add_gen_share_file
+EXTRA_TARGETS += $(subst //,/,$(1)/$(notdir $(2)))
+$(subst //,/,$(1)/$(notdir $(2))): $(2)
+       $$(P) mkdir -p $(1)
+       $$(Q) cp $(2) $(subst //,/,$(1)/$(notdir $(2)))
+endef
+
 define add_include_file
 $(eval $(call add_share_file,$(dir share/include/$(1)),$(1)))
 endef

diff --git a/techlibs/ice40/Makefile.inc b/techlibs/ice40/Makefile.inc
index 6907f0a0e6103b4cd79a41814f0004acaf99cbba..d7fec56857638b74c76c5afd063e685003c4537e 100644 (file)
--- a/techlibs/ice40/Makefile.inc
+++ b/techlibs/ice40/Makefile.inc
@@ -11,7 +11,8 @@ EXTRA_OBJS += techlibs/ice40/brams_init.mk
 .SECONDARY: techlibs/ice40/brams_init.mk
 
 techlibs/ice40/brams_init.mk: techlibs/ice40/brams_init.py
-       $(P) cd share/ice40 && python $<
+       $(Q) mkdir -p techlibs/ice40
+       $(P) cd techlibs/ice40 && python $<
        $(Q) touch techlibs/ice40/brams_init.mk
 
 techlibs/ice40/brams_init1.vh: techlibs/ice40/brams_init.mk
@@ -24,3 +25,7 @@ $(eval $(call add_share_file,share/ice40,techlibs/ice40/cells_sim.v))
 $(eval $(call add_share_file,share/ice40,techlibs/ice40/brams.txt))
 $(eval $(call add_share_file,share/ice40,techlibs/ice40/brams_map.v))
 
+$(eval $(call add_gen_share_file,share/ice40,techlibs/ice40/brams_init1.vh))
+$(eval $(call add_gen_share_file,share/ice40,techlibs/ice40/brams_init2.vh))
+$(eval $(call add_gen_share_file,share/ice40,techlibs/ice40/brams_init3.vh))
+

diff --git a/techlibs/xilinx/Makefile.inc b/techlibs/xilinx/Makefile.inc
index c6cf1a7d373e0142a56adc495222f43627cd6f7b..29d3fe9d7b0a75edc0a2a537dab580d2a4fd520d 100644 (file)
--- a/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@ -10,7 +10,8 @@ EXTRA_OBJS += techlibs/xilinx/brams_init.mk
 .SECONDARY: techlibs/xilinx/brams_init.mk
 
 techlibs/xilinx/brams_init.mk: techlibs/xilinx/brams_init.py
-       $(P) cd share/xilinx && python $<
+       $(Q) mkdir -p techlibs/xilinx
+       $(P) cd techlibs/xilinx && python $<
        $(Q) touch $@
 
 techlibs/xilinx/brams_init_36.vh: techlibs/xilinx/brams_init.mk
@@ -28,3 +29,8 @@ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/drams_map.v))
 $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/drams_bb.v))
 $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/arith_map.v))
 
+$(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_36.vh))
+$(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_32.vh))
+$(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_18.vh))
+$(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_16.vh))
+