Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:52:50 +0000 (14:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:53:54 +0000 (14:53 +0100)
* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
doc/Makefile

See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/Makefile

diff --combined doc/Makefile
@@@ -1,74 -1,36 +1,74 @@@
 -ALLMANPAGES = $(AVBASENAMES:%=%.1)
 -MANPAGES    = $(AVPROGS-yes:%=doc/%.1)
 -PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)
 -HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html)                               \
 +LIBRARIES-$(CONFIG_AVUTIL)     += libavutil
 +LIBRARIES-$(CONFIG_SWSCALE)    += libswscale
 +LIBRARIES-$(CONFIG_SWRESAMPLE) += libswresample
 +LIBRARIES-$(CONFIG_AVCODEC)    += libavcodec
 +LIBRARIES-$(CONFIG_AVFORMAT)   += libavformat
 +LIBRARIES-$(CONFIG_AVDEVICE)   += libavdevice
 +LIBRARIES-$(CONFIG_AVFILTER)   += libavfilter
 +
 +COMPONENTS-$(CONFIG_AVUTIL)     += ffmpeg-utils
 +COMPONENTS-$(CONFIG_SWSCALE)    += ffmpeg-scaler
 +COMPONENTS-$(CONFIG_SWRESAMPLE) += ffmpeg-resampler
 +COMPONENTS-$(CONFIG_AVCODEC)    += ffmpeg-codecs ffmpeg-bitstream-filters
 +COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpeg-formats ffmpeg-protocols
 +COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
 +COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
 +
 +MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
 +MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
 +MANPAGES    = $(MANPAGES1) $(MANPAGES3)
 +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                                             \
                doc/general.html                                          \
                doc/git-howto.html                                        \
 -              doc/libavfilter.html                                      \
                doc/nut.html                                              \
                doc/platform.html                                         \
  
 -DOCS-$(CONFIG_POD2MAN)                          += $(MANPAGES) $(PODPAGES)
 -DOCS-$(CONFIG_TEXI2HTML)                        += $(HTMLPAGES)
 +TXTPAGES    = doc/fate.txt                                              \
 +
 +
 +DOCS-$(CONFIG_HTMLPAGES) += $(HTMLPAGES)
 +DOCS-$(CONFIG_PODPAGES)  += $(PODPAGES)
 +DOCS-$(CONFIG_MANPAGES)  += $(MANPAGES)
 +DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
  DOCS = $(DOCS-yes)
  
 -DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)           += output
 -DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)    += transcode_aac
 -ALL_DOC_EXAMPLES = output transcode_aac
 +DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE)      += avio_reading
 +DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding
 +DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
 +DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE)   += filtering_audio
 +DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE)   += filtering_video
 +DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE)          += metadata
 +DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE)            += muxing
 +DOC_EXAMPLES-$(CONFIG_REMUXING_EXAMPLE)          += remuxing
 +DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE)  += resampling_audio
 +DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE)     += scaling_video
 +DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)     += transcode_aac
 +ALL_DOC_EXAMPLES_LIST = $(DOC_EXAMPLES-) $(DOC_EXAMPLES-yes)
 +
 +DOC_EXAMPLES       := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF))
 +ALL_DOC_EXAMPLES   := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)$(EXESUF))
 +ALL_DOC_EXAMPLES_G := $(ALL_DOC_EXAMPLES_LIST:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))
 +PROGS              += $(DOC_EXAMPLES)
  
 -DOC_EXAMPLES     := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
 -ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF))
 -PROGS            += $(DOC_EXAMPLES)
 +all-$(CONFIG_DOC): doc
  
 -all: $(DOCS)
 +doc: documentation
  
  apidoc: doc/doxy/html
  documentation: $(DOCS)
  
  examples: $(DOC_EXAMPLES)
  
 -TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 +TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $(SRC_PATH) $< $@ >$(@:%=%.d)
 +
 +doc/%.txt: TAG = TXT
 +doc/%.txt: doc/%.texi
 +      $(Q)$(TEXIDEP)
 +      $(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
  
  GENTEXI  = format codec
  GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
@@@ -80,85 -42,53 +80,87 @@@ $(GENTEXI): doc/avoptions_%.texi: doc/p
  doc/%.html: TAG = HTML
  doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
        $(Q)$(TEXIDEP)
 -      $(M)texi2html -I doc -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
 +      $(M)texi2html -I doc -monolithic --D=config-not-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
 +
 +doc/%-all.html: TAG = HTML
 +doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
 +      $(Q)$(TEXIDEP)
 +      $(M)texi2html -I doc -monolithic --D=config-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
  
  doc/%.pod: TAG = POD
  doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
        $(Q)$(TEXIDEP)
 -      $(M)$(SRC_PATH)/doc/texi2pod.pl -Idoc $< $@
 +      $(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-not-all=yes -Idoc $< $@
 +
 +doc/%-all.pod: TAG = POD
 +doc/%-all.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
 +      $(Q)$(TEXIDEP)
 +      $(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
  
 -doc/%.1: TAG = MAN
 +doc/%.1 doc/%.3: TAG = MAN
  doc/%.1: doc/%.pod $(GENTEXI)
        $(M)pod2man --section=1 --center=" " --release=" " $< > $@
 +doc/%.3: doc/%.pod $(GENTEXI)
 +      $(M)pod2man --section=3 --center=" " --release=" " $< > $@
  
  $(DOCS) doc/doxy/html: | doc/
  $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
  OBJDIRS += doc/examples
  
- doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
-       $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+ DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS))
 -DOXY_TEMPLATES  = doxy_stylesheet.css footer.html header.html
 -DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES))
 -doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(DOXY_TEMPLATES)
++doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT)
+       $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
  
 -install-progs-$(CONFIG_POD2MAN): install-man
 -install-progs-$(CONFIG_TEXI2HTML): install-doc
 +install-doc: install-html install-man
  
 -install-doc: $(HTMLPAGES)
 +install-html:
 +
 +install-man:
 +
 +ifdef CONFIG_HTMLPAGES
 +install-progs-$(CONFIG_DOC): install-html
 +
 +install-html: $(HTMLPAGES)
        $(Q)mkdir -p "$(DOCDIR)"
        $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
 +endif
 +
 +ifdef CONFIG_MANPAGES
 +install-progs-$(CONFIG_DOC): install-man
  
  install-man: $(MANPAGES)
        $(Q)mkdir -p "$(MANDIR)/man1"
 -      $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 +      $(INSTALL) -m 644 $(MANPAGES1) "$(MANDIR)/man1"
 +      $(Q)mkdir -p "$(MANDIR)/man3"
 +      $(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
 +endif
  
 -uninstall: uninstall-doc uninstall-man
 +uninstall: uninstall-doc
  
 -uninstall-doc:
 +uninstall-doc: uninstall-html uninstall-man
 +
 +uninstall-html:
        $(RM) -r "$(DOCDIR)"
  
  uninstall-man:
 -      $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 +      $(RM) $(addprefix "$(MANDIR)/man1/",$(AVPROGS-yes:%=%.1) $(AVPROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1))
 +      $(RM) $(addprefix "$(MANDIR)/man3/",$(LIBRARIES-yes:%=%.3))
 +
 +clean:: docclean
 +
 +distclean:: docclean
 +      $(RM) doc/config.texi
 +
 +examplesclean:
 +      $(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G)
 +      $(RM) $(CLEANSUFFIXES:%=doc/examples/%)
  
 -clean::
 -      $(RM) $(ALL_DOC_EXAMPLES)
 -      $(RM) $(CLEANSUFFIXES:%=doc/%) $(CLEANSUFFIXES:%=doc/examples/%)
 -      $(RM) doc/*.html doc/*.pod doc/*.1 doc/avoptions_*.texi
 +docclean: examplesclean
 +      $(RM) $(CLEANSUFFIXES:%=doc/%)
 +      $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 doc/avoptions_*.texi
        $(RM) -r doc/doxy/html
  
  -include $(wildcard $(DOCS:%=%.d))
  
 -.PHONY: apidoc documentation
 +.PHONY: apidoc doc documentation