summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-26 01:31:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-26 01:31:00 +0100
commit6d34aa245df8e345ee73b6be3a4d24526e766ad5 (patch)
tree30a7762f6de781a063a55de69e78f6fde3ac1e7b /Makefile
parent5ded4332f195869df4b8b6b667cdb445113b8e34 (diff)
parentab81f24ad43bddf77ddd25cba86780c1c884996c (diff)
downloadffmpeg-streaming-6d34aa245df8e345ee73b6be3a4d24526e766ad5.zip
ffmpeg-streaming-6d34aa245df8e345ee73b6be3a4d24526e766ad5.tar.gz
Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'
* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c': build: Integrate multilibrary examples into the build system Conflicts: configure doc/Makefile doc/examples/muxing.c doc/examples/output.c libavformat/Makefile libavformat/output-example.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f79712c..f169ce9 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,8 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
+include $(SRC_PATH)/doc/Makefile
+
define DOPROG
OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
@@ -168,7 +170,6 @@ config:
check: all alltools examples testprogs fate
-include $(SRC_PATH)/doc/Makefile
include $(SRC_PATH)/tests/Makefile
$(sort $(OBJDIRS)):
OpenPOWER on IntegriCloud