Corrected and simplified Makefile

Cleanup .gitignore

Author: d-m-bailey

.gitignore

@@ -1,17 +1,17 @@
 /.idea/
 /precheck_results/
 */tmp
-*/*/tmp
 *.hex*
 *.lst
 *.vcd
 *.gtkw
 /env
-/venv
-/caravel
-/runs
-/dependencies
-/mgmt_core_wrapper
+/venv/
+/venv-cocotb/
+/caravel/
+runs/
+/dependencies/
+/mgmt_core_wrapper/
 /logs
-/lvs_results/
+lvs_results/
 __pycache__/

openlane/Makefile

@@ -13,13 +13,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+SHELL := /bin/bash
 MAKEFLAGS+=--warn-undefined-variables
 
 export OPENLANE_RUN_TAG = $(shell date '+%y_%m_%d_%H_%M')
 OPENLANE_TAG ?= 2024.08.15
 OPENLANE_IMAGE_NAME ?= efabless/openlane:$(OPENLANE_TAG)
-designs = $(shell find * -maxdepth 0 -type d)
-current_design = null
+designs=$(shell find * -maxdepth 0 -type d)
 
 ROOTLESS ?= 0
 USER_ARGS = -u $$(id -u $$USER):$$(id -g $$USER)
@@ -67,24 +67,21 @@ list:
 	@echo $(designs)
 
 .PHONY: $(designs)
-$(designs) : % : ./%/config.json
-ifneq (,$(wildcard ./$(MAKECMDGOALS)/interactive.tcl))
-	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG) 
+$(designs) : % :
+	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG)
 	rm -rf ./$*/runs/$*
 	ln -s $$(realpath ./$*/runs/$(OPENLANE_RUN_TAG)) ./$*/runs/$*
-	$(docker_run) \
-		$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd_interactive)
-else
-	# $(current_design)
-	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG) 
-	rm -rf ./$*/runs/$*
-	ln -s $$(realpath ./$*/runs/$(OPENLANE_RUN_TAG)) ./$*/runs/$*
-	$(docker_run) \
-		$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd)
-endif
+	if [[ -f ./$@/interactive.tcl ]]; then \
+		$(docker_run) \
+			$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd_interactive); \
+	else \
+		$(docker_run) \
+			$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd); \
+	fi
 	@mkdir -p ../signoff/$*/
 	@cp ./$*/runs/$*/OPENLANE_VERSION ../signoff/$*/
 	@cp ./$*/runs/$*/PDK_SOURCES ../signoff/$*/
+	@cp ./$*/runs/$*/reports/*.csv ../signoff/$*/
 
 .PHONY: openlane
 openlane: check-openlane-env