diff options
| author | Clément Bœsch <u@pkh.me> | 2017-05-03 12:51:48 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-05-03 16:49:12 +0200 |
| commit | 3f17751eeb7e3348576e2597884d5e5155aadcfb (patch) | |
| tree | 63d0f773c095f4293f6b35c317df964c6d0f69d5 /doc | |
| parent | c3e08544100cdd7045f710bfcea33e07d9fcd25b (diff) | |
| parent | 11a9320de54759340531177c9f2b1e31e6112cc2 (diff) | |
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | doc/writing_filters.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/Makefile b/doc/Makefile index c193fc3a66..4cc9eedd12 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -128,7 +128,7 @@ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c) -DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) config.mak +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) diff --git a/doc/writing_filters.txt b/doc/writing_filters.txt index 66ebb53243..5cd4ecd6a4 100644 --- a/doc/writing_filters.txt +++ b/doc/writing_filters.txt @@ -38,14 +38,14 @@ the build system and the C: --- after running configure --- - $ grep FOOBAR config.mak + $ grep FOOBAR ffbuild/config.mak CONFIG_FOOBAR_FILTER=yes $ grep FOOBAR config.h #define CONFIG_FOOBAR_FILTER 1 -CONFIG_FOOBAR_FILTER=yes from the config.mak is later used to enable the filter in -libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h will be used -for registering the filter in libavfilter/allfilters.c. +CONFIG_FOOBAR_FILTER=yes from the ffbuild/config.mak is later used to enable +the filter in libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h +will be used for registering the filter in libavfilter/allfilters.c. Filter code layout ================== |