Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'

* commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f':
  build: Drop leftover reference to old EXAMPLES logic

Merged-by: James Almer <jamrial@gmail.com>

diff --cc Makefile
index 29870d7710033f4b40f2a73b91c9b7645dbe71c2,b14b29d76aafe133631d13b6e5544eb12d068fcd..e4eb0502267cc5680d448795875b734b01c4f462
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -95,12 -131,11 +95,12 @@@ ffbuild/.config: $(CONFIGURABLE_COMPONE
        @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
        @-tput sgr0 2>/dev/null
  
- SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
+ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
                 HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
                 ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
 -               ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS                  \
 -               OBJS HOSTOBJS TESTOBJS
 +               ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
 +               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
 +               MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
  
  define RESET
  $(1) :=

diff --cc doc/Makefile
index b670f0bd4c7c0917d63a2792d7b430c854f86613,bd5c2e4b7ff080b495d2af13f0df7b4bd0e32b41..b83f2d52fa5ec79234e5ca83a250623c0df181e8
--- 1/doc/Makefile
--- 2/doc/Makefile
+++ b/doc/Makefile
@@@ -128,29 -73,19 +128,29 @@@ $(DOCS) doc/doxy/html: | doc
  $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
  OBJDIRS += doc/examples
  
- DOXY_INPUT      = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)
 -DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c))
 -DOXY_TEMPLATES  = doxy_stylesheet.css footer.html header.html
 -DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES))
++DOXY_INPUT      = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c)
 +DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak
 +
 +doc/doxy/html: TAG = DOXY
 +doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
 +      $(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
 +
 +install-doc: install-html install-man
 +
 +install-html:
  
 -doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(DOXY_TEMPLATES)
 -      $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
 +install-man:
  
 -install-progs-$(CONFIG_POD2MAN): install-man
 -install-progs-$(CONFIG_TEXI2HTML): install-doc
 +ifdef CONFIG_HTMLPAGES
 +install-progs-$(CONFIG_DOC): install-html
  
 -install-doc: $(HTMLPAGES)
 +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"