build: don't make version.sh create version.h by default

You could actually run version.sh, and then the waf build system could
accidentally pick up the generated (and most likely stale) version.h.
This commit is contained in:
wm4 2015-07-14 23:09:44 +02:00
parent e1ab9b905f
commit 739d345d6c
2 changed files with 6 additions and 7 deletions

View File

@ -381,8 +381,8 @@ config.mak: configure
@echo "####### Please run ./configure again - it's changed! #######" @echo "####### Please run ./configure again - it's changed! #######"
@echo "############################################################" @echo "############################################################"
version.h .version: version.sh old_build/version.h .version: version.sh
./$< ./version.sh --versionh=old_build/version.h
# Force version.sh to run to potentially regenerate version.h # Force version.sh to run to potentially regenerate version.h
-include .version -include .version
@ -393,7 +393,7 @@ version.h .version: version.sh
###### dependency declarations / specific CFLAGS ###### ###### dependency declarations / specific CFLAGS ######
common/version.c: version.h common/version.c: old_build/version.h
DOCS/man/mpv.1: DOCS/man/af.rst \ DOCS/man/mpv.1: DOCS/man/af.rst \
DOCS/man/ao.rst \ DOCS/man/ao.rst \
@ -464,7 +464,7 @@ clean:
-$(RM) $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) -$(RM) $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~)
-$(RM) mpv -$(RM) mpv
-$(RM) DOCS/man/*/mpv.1 -$(RM) DOCS/man/*/mpv.1
-$(RM) version.h -$(RM) old_build/version.h version.h
-$(RM) input/input_conf.h -$(RM) input/input_conf.h
-$(RM) video/out/vdpau_template.c -$(RM) video/out/vdpau_template.c
-$(RM) demux/ebml_types.h demux/ebml_defs.c -$(RM) demux/ebml_types.h demux/ebml_defs.c

View File

@ -3,6 +3,7 @@
export LC_ALL=C export LC_ALL=C
version_h="version.h" version_h="version.h"
print=yes
for ac_option do for ac_option do
ac_arg=$(echo $ac_option | cut -d '=' -f 2-) ac_arg=$(echo $ac_option | cut -d '=' -f 2-)
@ -12,13 +13,11 @@ for ac_option do
;; ;;
--versionh=*) --versionh=*)
version_h="$(pwd)/$ac_arg" version_h="$(pwd)/$ac_arg"
print=no
;; ;;
--cwd=*) --cwd=*)
cwd="$ac_arg" cwd="$ac_arg"
;; ;;
--print)
print=yes
;;
*) *)
echo "Unknown parameter: $ac_option" >&2 echo "Unknown parameter: $ac_option" >&2
exit 1 exit 1