diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 19:08:37 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 19:08:37 -0300 |
| commit | d4b00a23c6828098205bd71c571522d4fee9e20b (patch) | |
| tree | 0284379cd83e31199a9edca3bf0461d12281b404 | |
| parent | 1015982f45d832ee926a81460121673a97292333 (diff) | |
| parent | 533339bdcc3b39bbd708c723b3cd0b5898350f0f (diff) | |
| download | ffmpeg-streaming-d4b00a23c6828098205bd71c571522d4fee9e20b.zip ffmpeg-streaming-d4b00a23c6828098205bd71c571522d4fee9e20b.tar.gz | |
Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'
* commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f':
build: Drop leftover reference to old EXAMPLES logic
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -95,7 +95,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS) @-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 X86ASM-OBJS \ diff --git a/doc/Makefile b/doc/Makefile index b670f0b..b83f2d5 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -128,7 +128,7 @@ $(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 = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak doc/doxy/html: TAG = DOXY |
