From d3b958a35e8f8fda95a1bcab0805c12761e5b4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Fischer?= Date: Sat, 9 Mar 2024 12:50:04 +0100 Subject: [PATCH] Fix Circular dependency warning (#3477) --- include/Make/Compile.make | 6 +++--- mswindows/{generic.manifest.rc => generic.manifest.rc.in} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename mswindows/{generic.manifest.rc => generic.manifest.rc.in} (100%) diff --git a/include/Make/Compile.make b/include/Make/Compile.make index b1cf360a59b..f6638dde5e4 100644 --- a/include/Make/Compile.make +++ b/include/Make/Compile.make @@ -47,14 +47,14 @@ depend: $(C_SOURCES) $(CC_SOURCES) $(CPP_SOURCES) %.manifest.res: %.manifest.rc %.exe.manifest $(WINDRES) --input=$< --input-format=rc --output=$@ --output-format=coff -I$(MODULE_TOPDIR)/mswindows -%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc +%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc.in sed -e 's/@CMD@/$(notdir $*)/' \ -e 's/@VER_MAJOR@/$(GRASS_VERSION_MAJOR)/' \ -e 's/@VER_MINOR@/$(GRASS_VERSION_MINOR)/' \ -e 's/@VER_RELEASE@/$(GRASS_VERSION_RELEASE)/' \ - $(MODULE_TOPDIR)/mswindows/generic.manifest.rc > $@ + $^ > $@ %.exe.manifest: $(MODULE_TOPDIR)/mswindows/generic.manifest - sed 's/@CMD@/$(notdir $*)/' $(MODULE_TOPDIR)/mswindows/generic.manifest > $@ + sed 's/@CMD@/$(notdir $*)/' $^ > $@ -include $(DEPFILE) diff --git a/mswindows/generic.manifest.rc b/mswindows/generic.manifest.rc.in similarity index 100% rename from mswindows/generic.manifest.rc rename to mswindows/generic.manifest.rc.in