summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2013-11-28 16:29:41 -0800
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 21:42:55 +0100
commit82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3 (patch)
tree9abe2fac34d224c8f6fe97d0028cb661687ac2c2 /Makefile
parentc5806910918eb9adc3b3a821242cc4bc7647a50f (diff)
downloadffmpeg-82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3.tar.gz
build: rename version.h to libavutil/ffversion.h
Also the libavutil/ffversion.h will be installed. Rationale: * Applications might want to know FFmpeg's version besides the individual libraries'. * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when a library source file includes both and is compiled on an out-of-tree build. Fixes #1769. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 495d6c6597..51f0a18d99 100644
--- a/Makefile
+++ b/Makefile
@@ -119,8 +119,8 @@ GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@
-version.h .version:
- $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
+libavutil/ffversion.h .version:
+ $(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
$(Q)touch .version
# force version.sh to run whenever version might have changed
@@ -163,7 +163,7 @@ clean::
distclean::
$(RM) $(DISTCLEANSUFFIXES)
- $(RM) config.* .config libavutil/avconfig.h .version version.h libavcodec/codec_names.h
+ $(RM) config.* .config libavutil/avconfig.h .version libavutil/ffversion.h libavcodec/codec_names.h
config:
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)