Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 03:55:35 +0000 (04:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 03:55:35 +0000 (04:55 +0100)
* commit 'f187557ab4612776f7f527ecf3d40062975c3e4c':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
configure
doc/Makefile

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

diff --cc configure
+++ b/configure
@@@ -1227,14 -1077,6 +1227,13 @@@ EXTERNAL_LIBRARY_LIST=
      zlib
  "
  
-     doc
 +DOCUMENT_LIST="
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
  HWACCEL_LIST="
      dxva2
      vaapi
@@@ -2279,23 -1953,16 +2278,22 @@@ postproc_deps="avutil gpl
  swscale_deps="avutil"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale"
 -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 -               fps_filter null_filter resample_filter scale_filter
 +ffmpeg_deps="avcodec avfilter avformat swresample"
 +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
 +               null_filter
                 setpts_filter trim_filter"
 -avplay_deps="avcodec avformat avresample swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat fork !shared"
 -avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 -avserver_extralibs='$ldl'
 +ffplay_deps="avcodec avformat swscale swresample sdl"
 +ffplay_select="rdft crop_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat fork sarestart"
 +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 +ffserver_extralibs='$ldl'
 +
 +# documentation
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="texi2html"
 +txtpages_deps="makeinfo"
- doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters
  
@@@ -4362,28 -3866,14 +4360,28 @@@ if check_pkg_config sdl SDL_events.h SD
      check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
      check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
      enable sdl
 +else
 +  if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
 +    sdl_cflags=$("${SDL_CONFIG}" --cflags)
 +    sdl_libs=$("${SDL_CONFIG}" --libs)
 +    check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
 +    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
 +    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
 +    enable sdl
 +  fi
  fi
 +enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
- perl --version > /dev/null 2>&1 && enable perl || disable perl
 +texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 +makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+ perl -v            > /dev/null 2>&1 && enable perl      || disable perl
 +pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
 +rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
  
  check_header linux/fb.h
 +check_header linux/videodev.h
  check_header linux/videodev2.h
 -check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
 +check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_header sys/videoio.h
  
diff --cc doc/Makefile
@@@ -27,18 -9,12 +27,17 @@@ HTMLPAGES   = $(PROGS-yes:%=doc/%.html
                doc/nut.html                                              \
                doc/platform.html                                         \
  
 -DOCS-$(CONFIG_PERL)                             += $(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)
  
- all-$(CONFIG_DOC): doc
 +doc: documentation
+ all: $(DOCS)
  
  apidoc: doc/doxy/html
  documentation: $(DOCS)
@@@ -88,22 -47,12 +87,22 @@@ $(DOCS) doc/doxy/html: | doc
  doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
        $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
  
 -install-progs-$(CONFIG_PERL): 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-progs: install-html
 +
 +install-html: $(HTMLPAGES)
        $(Q)mkdir -p "$(DOCDIR)"
        $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
- install-progs-$(CONFIG_DOC): install-man
 +endif
 +
 +ifdef CONFIG_MANPAGES
++install-progs: install-man
  
  install-man: $(MANPAGES)
        $(Q)mkdir -p "$(MANDIR)/man1"