1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-30 08:35:41 +02:00

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix examples compilation when EXESUF is not empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-10 14:20:43 +01:00
commit 1c1bb203dd

View File

@ -104,7 +104,7 @@ doc/%.3: doc/%.pod $(GENTEXI)
$(M)pod2man --section=3 --center=" " --release=" " $< > $@ $(M)pod2man --section=3 --center=" " --release=" " $< > $@
$(DOCS) doc/doxy/html: | doc/ $(DOCS) doc/doxy/html: | doc/
$(DOC_EXAMPLES:%=%.o): | doc/examples $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
OBJDIRS += doc/examples OBJDIRS += doc/examples
doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS) doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)