Skip to content

Commit

Permalink
Fix Circular dependency warning (#3477)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n authored and neteler committed Mar 9, 2024
1 parent 5b010cc commit d3b958a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/Make/Compile.make
Original file line number Diff line number Diff line change
Expand Up @@ -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)
File renamed without changes.

0 comments on commit d3b958a

Please sign in to comment.