From 21513c1c614944c76dc760ac2eeac5ef3f41de47 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 21 Dec 2012 20:25:35 -0300 Subject: [PATCH] title page: always generate title.ps when generating the catalog In order to keep "phony" title.ps from triggering a catalog rebuild when nothing has changed, we also have to remove it as a dependency from "catalog", and just invoke "make" explicitly. --- common/Makefile.title | 2 ++ components/Makefile | 3 ++- modules/Makefile | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/Makefile.title b/common/Makefile.title index 5f8c45a..1584e22 100644 --- a/common/Makefile.title +++ b/common/Makefile.title @@ -5,6 +5,8 @@ COMMIT_DATE := $(shell date -u +'%F %T UTC' \ GIT_HASH := $(shell git rev-parse HEAD) GIT_STATUS := $(shell [ -z "`git status -s -uno`" ] || echo +) +.PHONY: title.ps + title.ps: ../common/title.fig fig2dev -L ps $< | \ sed -e "s||$(TITLE_NAME)|" \ diff --git a/components/Makefile b/components/Makefile index 49c12f1..115a7e9 100644 --- a/components/Makefile +++ b/components/Makefile @@ -26,7 +26,8 @@ sch: $(GEN) DESCR-dcm: *.dcm ../scripts/dcm2desc -L . >$@ || { rm -f $@; exit 1; } -catalog catalog.pdf: HIERARCHY DESCR-dcm *.lib $(GEN) title.ps +catalog catalog.pdf: HIERARCHY DESCR-dcm *.lib $(GEN) + $(MAKE) title.ps genkicat -p -L . -t title.ps HIERARCHY DESCR-dcm \ >catalog.pdf || \ { rm -f catalog.pdf; exit 1; } diff --git a/modules/Makefile b/modules/Makefile index 3151209..53b5602 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -40,7 +40,8 @@ modules.pro: Makefile brd: all modules.pro pcbnew `pwd`/modules.brd -catalog catalog.pdf: HIERARCHY $(MODULES:%=%.fpd) title.ps +catalog catalog.pdf: HIERARCHY $(MODULES:%=%.fpd) + $(MAKE) title.ps genkicat -F -p $(MODULES:%=-l %.fpd) -t title.ps \ HIERARCHY DESCR >catalog.pdf || \ { rm -f catalog.pdf; exit 1; }