From 2e07473015440d2bc0650545621b488663c8705f Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 21 Dec 2012 20:27:39 -0300 Subject: [PATCH] include common/Makefile after "all", so that it won't override the default --- components/Makefile | 4 ++-- modules/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/Makefile b/components/Makefile index 115a7e9..5fd2f5f 100644 --- a/components/Makefile +++ b/components/Makefile @@ -11,8 +11,6 @@ GEN = gencon.lib TITLE_NAME = SYMBOLS/COMPONENTS TITLE_FILE = kicad-libs-components.pdf -include ../common/Makefile.title - .PHONY: all sch catalog view upload missing clean spotless all: $(GEN) @@ -26,6 +24,8 @@ sch: $(GEN) DESCR-dcm: *.dcm ../scripts/dcm2desc -L . >$@ || { rm -f $@; exit 1; } +include ../common/Makefile.title + catalog catalog.pdf: HIERARCHY DESCR-dcm *.lib $(GEN) $(MAKE) title.ps genkicat -p -L . -t title.ps HIERARCHY DESCR-dcm \ diff --git a/modules/Makefile b/modules/Makefile index 53b5602..f24051e 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -23,8 +23,6 @@ SHELL = /bin/bash TITLE_NAME = FOOTPRINTS/MODULES TITLE_FILE = kicad-libs-modules.pdf -include ../common/Makefile.title - .SUFFIXES: .fpd .mod .PHONY: all brd catalog view upload missing clean spotless @@ -40,6 +38,8 @@ modules.pro: Makefile brd: all modules.pro pcbnew `pwd`/modules.brd +include ../common/Makefile.title + catalog catalog.pdf: HIERARCHY $(MODULES:%=%.fpd) $(MAKE) title.ps genkicat -F -p $(MODULES:%=-l %.fpd) -t title.ps \