This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit a8968b14250c85de947fce4df9793b88c8580869 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Jun 30 21:47:59 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Thu Jul 2 20:39:29 2026 +0200 Makefile, ffbuild/{common,library}: Allow to build DEVTOOLS These tools run on the target and are supposed to be used for development; they are basically the same as TESTPROGS, just without the presumption of living in the tests subdirectory. Signed-off-by: Andreas Rheinhardt <[email protected]> --- Makefile | 6 +++--- ffbuild/common.mak | 6 ++++-- ffbuild/library.mak | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b2761a6151..649bf5132b 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS) @-printf '\nWARNING: $(?) newer than config_components.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ +SUBDIR_VARS := CLEANFILES FFLIBS DEVPROGS HOSTPROGS TESTPROGS TOOLS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ ALTIVEC-OBJS VSX-OBJS X86ASM-OBJS \ @@ -205,8 +205,8 @@ endif config: $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) -build: all alltools examples testprogs -check: all alltools examples testprogs fate +build: all alltools devprogs examples testprogs +check: all alltools devprogs examples testprogs fate include $(SRC_PATH)/tests/Makefile diff --git a/ffbuild/common.mak b/ffbuild/common.mak index fb55fe78b7..4ac54197b7 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -205,6 +205,7 @@ OBJS += $(OBJS-yes) SHLIBOBJS += $(SHLIBOBJS-yes) STLIBOBJS += $(STLIBOBJS-yes) FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS) +DEVPROGS += $(DEVPROGS-yes) TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) @@ -213,7 +214,8 @@ FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%= OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%)) STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%)) -TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o) +TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o) $(DEVPROGS:%=$(SUBDIR)%.o) +DEVPROGS := $(DEVPROGS:%=$(SUBDIR)%$(EXESUF)) TESTPROGS := $(TESTPROGS:%=$(SUBDIR)tests/%$(EXESUF)) HOSTOBJS := $(HOSTPROGS:%=$(SUBDIR)%.o) HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF)) @@ -259,7 +261,7 @@ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a define RULES clean:: - $(RM) $(HOSTPROGS) $(TESTPROGS) $(TOOLS) + $(RM) $(DEVPROGS) $(HOSTPROGS) $(TESTPROGS) $(TOOLS) endef $(eval $(RULES)) diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 89908d247e..c11ab4cdce 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -64,13 +64,13 @@ install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) -$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) +$(TESTPROGS) $(DEVPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(NAME)LINK_EXE_ARGS = $(LDFLAGS) $(LDEXEFLAGS) $(NAME)LINK_SO_ARGS = $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $(NAME)LINK_EXTRA = $(FFEXTRALIBS) -$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o +$(DEVPROGS) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(call LINK,$$(call $(NAME)LINK_EXE_ARGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $$(call $(NAME)LINK_EXTRA) $$(EXTRALIBS-$$(*F)) $$(ELIBS)) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h $(SUBDIR)version_major.h | $(SUBDIR) @@ -153,6 +153,6 @@ endef $(eval $(RULES)) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) -$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME) +$(TESTPROGS) $(DEVPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME) testprogs: $(TESTPROGS) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
