diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 00:05:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:12:24 +0100 |
| commit | 5ded4332f195869df4b8b6b667cdb445113b8e34 (patch) | |
| tree | e226bac305b92bc0d8d3a6113fe270332510768d /doc | |
| parent | 4782c4284fa3856a9b6910fe5ff6e4fb1c65b58c (diff) | |
| parent | 14abeaa43d021afdce9119d906891abe89c03b88 (diff) | |
| download | ffmpeg-5ded4332f195869df4b8b6b667cdb445113b8e34.tar.gz | |
Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
build: Separate building programs linking against libav* from building av*
Conflicts:
Makefile
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/Makefile b/doc/Makefile index 50a68b4e05..17f34cfaf3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -14,11 +14,11 @@ COMPONENTS-$(CONFIG_AVFORMAT) += ffmpeg-formats ffmpeg-protocols COMPONENTS-$(CONFIG_AVDEVICE) += ffmpeg-devices COMPONENTS-$(CONFIG_AVFILTER) += ffmpeg-filters -MANPAGES1 = $(PROGS-yes:%=doc/%.1) $(PROGS-yes:%=doc/%-all.1) $(COMPONENTS-yes:%=doc/%.1) +MANPAGES1 = $(AVPROGS-yes:%=doc/%.1) $(AVPROGS-yes:%=doc/%-all.1) $(COMPONENTS-yes:%=doc/%.1) MANPAGES3 = $(LIBRARIES-yes:%=doc/%.3) MANPAGES = $(MANPAGES1) $(MANPAGES3) -PODPAGES = $(PROGS-yes:%=doc/%.pod) $(PROGS-yes:%=doc/%-all.pod) $(COMPONENTS-yes:%=doc/%.pod) $(LIBRARIES-yes:%=doc/%.pod) -HTMLPAGES = $(PROGS-yes:%=doc/%.html) $(PROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \ +PODPAGES = $(AVPROGS-yes:%=doc/%.pod) $(AVPROGS-yes:%=doc/%-all.pod) $(COMPONENTS-yes:%=doc/%.pod) $(LIBRARIES-yes:%=doc/%.pod) +HTMLPAGES = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \ doc/developer.html \ doc/faq.html \ doc/fate.html \ @@ -120,7 +120,7 @@ uninstall-html: $(RM) -r "$(DOCDIR)" uninstall-man: - $(RM) $(addprefix "$(MANDIR)/man1/",$(PROGS-yes:%=%.1) $(PROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1)) + $(RM) $(addprefix "$(MANDIR)/man1/",$(AVPROGS-yes:%=%.1) $(AVPROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1)) $(RM) $(addprefix "$(MANDIR)/man3/",$(LIBRARIES-yes:%=%.3)) clean:: docclean |