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 <ijackson@chiark.greenend.org.uk>

diff --git a/Dir.sd.mk b/Dir.sd.mk
index cc4b67d2922145c6ac4b10dbca8a7bb2fec392a0..55f526d1304e0800aec9ffbf560b947d7fe4ac01 100644 (file)
--- 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 a7be94ca495ea845618fa6527a8e7cb0ee4f79d9..2646553f8205714b73ae464f0f591b1603979fb3 100644 (file)
--- 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