From 9f94741cd8c1cc3f3243ff570e903bed791ca301 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 1 Jan 2020 13:11:44 +0000 Subject: [PATCH] Makefiles: Make cat_CATS variable available in toplevel This is slightly clumsy, but it will enable us to talk about these files in Dir.sd.mk, which is going to be necessary. Signed-off-by: Ian Jackson --- Dir.sd.mk | 3 +++ cat/Dir.sd.mk | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dir.sd.mk b/Dir.sd.mk index cc4b67d..55f526d 100644 --- a/Dir.sd.mk +++ b/Dir.sd.mk @@ -46,6 +46,9 @@ LDLIBS:=@LIBS@ $(EXTRA_LDLIBS) &:local+global OBJECTS TARGETS +include &~catacomb-import/secnet-import.auto.mk +cat_CATS = $(addprefix cat/, $(CATACOMB_IMPORT_RECIPS)) + TARGETS:=secnet OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \ diff --git a/cat/Dir.sd.mk b/cat/Dir.sd.mk index a7be94c..2646553 100644 --- a/cat/Dir.sd.mk +++ b/cat/Dir.sd.mk @@ -15,10 +15,6 @@ # version 3 along with secnet; if not, see # https://www.gnu.org/licenses/gpl.html. -include &~catacomb-import/secnet-import.auto.mk - -&CATS = $(addprefix &/, $(CATACOMB_IMPORT_RECIPS)) - &TARGETS += &$CATS .SECONDARY: &cat-converted -- 2.30.2