[FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts

[Timo Rothenpieler <timo@rothenpieler.org>]

Without this, make install triggers a full re-generation of the graph
stuff, which results in re-linking during install.
---
 ffbuild/common.mak         | 3 +--
 fftools/resources/Makefile | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index 0e1eb1f62b..4a3cc0c748 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -229,10 +229,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
 SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
 HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
 PTXOBJS      = $(filter %.ptx.o,$(OBJS))
-RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS))
 $(HOBJS):     CCFLAGS += $(CFLAGS_HEADERS)
 checkheaders: $(HOBJS)
-.SECONDARY:   $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=)
+.SECONDARY:   $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=)
 
 alltools: $(TOOLS)
 
diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile
index 8579a52678..3a307bef12 100644
--- a/fftools/resources/Makefile
+++ b/fftools/resources/Makefile
@@ -4,10 +4,9 @@ clean::
 vpath %.html $(SRC_PATH)
 vpath %.css  $(SRC_PATH)
 
-# Uncomment to prevent deletion during build
-#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c
-
 OBJS-resman +=                     \
     fftools/resources/resman.o     \
     fftools/resources/graph.html.o \
     fftools/resources/graph.css.o  \
+
+.SECONDARY: $(OBJS-resman:.o=.c) $(OBJS-resman:.css.o=.css.min) $(OBJS-resman:.css.o=.css.min.gz) $(OBJS-resman:.html.o=.html.gz)
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".