RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: Separate logic for building examples from that for building avtools

This commit is contained in:
Diego Biurrun 2017-02-14 13:15:25 +01:00
parent acb0dea27e
commit ab566cc96b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -165,7 +165,7 @@ $(1)$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
-include $$(OBJS-$(1):.o=.d) -include $$(OBJS-$(1):.o=.d)
endef endef
$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=)))) $(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P))))
$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)

5
doc/examples/Makefile
View File

@ -12,6 +12,9 @@ DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF)) ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF))
PROGS += $(DOC_EXAMPLES) PROGS += $(DOC_EXAMPLES)
$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o))
$(DOC_EXAMPLES): %$(EXESUF): %.o
examples: $(DOC_EXAMPLES) examples: $(DOC_EXAMPLES)
$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
@ -23,4 +26,6 @@ clean::
$(RM) $(ALL_DOC_EXAMPLES) $(RM) $(ALL_DOC_EXAMPLES)
$(RM) $(CLEANSUFFIXES:%=doc/examples/%) $(RM) $(CLEANSUFFIXES:%=doc/examples/%)
-include $(wildcard $(DOC_EXAMPLES:%$(EXESUF)=%.d))
.PHONY: examples .PHONY: examples