diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 15:23:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 15:23:29 +0100 |
| commit | 71052d85c16bd65fa1e3e01d9040f9a3925efd7a (patch) | |
| tree | 00faaf22a36c15008159c08cc7343d72482b38a5 | |
| parent | cbf09bb63f31f100761d607a1cef5141bdfa96fa (diff) | |
| parent | 3a26ccbf0d9f806d067e76a3f484170abecb36b3 (diff) | |
| download | ffmpeg-71052d85c16bd65fa1e3e01d9040f9a3925efd7a.tar.gz | |
Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'
* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
build: doxy: Include code examples in Doxygen documentation
Conflicts:
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | library.mak | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/Makefile b/doc/Makefile index ae0e95f20b..3334ca22cb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -107,7 +107,7 @@ $(DOCS) doc/doxy/html: | doc/ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples -DOXY_INPUT = $(addprefix $(SRC_PATH)/, $(INSTHEADERS)) +DOXY_INPUT = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)) doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT) diff --git a/library.mak b/library.mak index 45096a741f..8bafb04717 100644 --- a/library.mak +++ b/library.mak @@ -5,6 +5,7 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) LIBMINOR := $(lib$(NAME)_VERSION_MINOR) INCINSTDIR := $(INCDIR)/lib$(NAME) +LIB_EXAMPLES := $(LIB_EXAMPLES) $(EXAMPLES) INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) |