summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-02-14 13:15:25 +0100
committerDiego Biurrun <diego@biurrun.de>2017-02-21 16:10:51 +0100
commitab566cc96bc0c31b34d944214bc06cec8ae8b640 (patch)
tree8b8fb034c8cf71818064b57fd5b36ca0efd0e32a
parentacb0dea27efff4b35796015b96570b59fd517078 (diff)
downloadffmpeg-streaming-ab566cc96bc0c31b34d944214bc06cec8ae8b640.zip
ffmpeg-streaming-ab566cc96bc0c31b34d944214bc06cec8ae8b640.tar.gz
build: Separate logic for building examples from that for building avtools
-rw-r--r--Makefile2
-rw-r--r--doc/examples/Makefile5
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c96e079..2932e6e 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ $(1)$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
-include $$(OBJS-$(1):.o=.d)
endef
-$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
+$(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P))))
$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index b24ca28..c42c68f 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -12,6 +12,9 @@ DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF))
PROGS += $(DOC_EXAMPLES)
+$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o))
+$(DOC_EXAMPLES): %$(EXESUF): %.o
+
examples: $(DOC_EXAMPLES)
$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
@@ -23,4 +26,6 @@ clean::
$(RM) $(ALL_DOC_EXAMPLES)
$(RM) $(CLEANSUFFIXES:%=doc/examples/%)
+-include $(wildcard $(DOC_EXAMPLES:%$(EXESUF)=%.d))
+
.PHONY: examples
OpenPOWER on IntegriCloud