From d8acf79f0c296d004977dc500ca1b6e7cd0b56da Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 6 Nov 2017 16:38:06 -0800 Subject: [PATCH] autotools: change version TINY -> PATCH Because patch is more common than tiny for talking about the 3rd element of a version. Signed-off-by: Dylan Baker Reviewed-by: Emil Velikov --- configure.ac | 8 ++++---- src/gallium/state_trackers/xa/xa_tracker.h.in | 2 +- src/gallium/targets/d3dadapter9/Makefile.am | 2 +- src/gallium/targets/xa/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 300ee1a89ea..1344c12884f 100644 --- a/configure.ac +++ b/configure.ac @@ -2846,8 +2846,8 @@ AM_CONDITIONAL(HAVE_ARM_ASM, test "x$asm_arch" = xarm) AC_SUBST([NINE_MAJOR], 1) AC_SUBST([NINE_MINOR], 0) -AC_SUBST([NINE_TINY], 0) -AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_TINY") +AC_SUBST([NINE_PATCH], 0) +AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_PATCH") AC_SUBST([VDPAU_MAJOR], 1) AC_SUBST([VDPAU_MINOR], 0) @@ -2866,8 +2866,8 @@ AC_SUBST([XVMC_MINOR], 0) AC_SUBST([XA_MAJOR], 2) AC_SUBST([XA_MINOR], 3) -AC_SUBST([XA_TINY], 0) -AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_TINY") +AC_SUBST([XA_PATCH], 0) +AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_PATCH") AC_ARG_ENABLE(valgrind, [AS_HELP_STRING([--enable-valgrind], diff --git a/src/gallium/state_trackers/xa/xa_tracker.h.in b/src/gallium/state_trackers/xa/xa_tracker.h.in index 26c4f21d0f4..fc721eed38b 100644 --- a/src/gallium/state_trackers/xa/xa_tracker.h.in +++ b/src/gallium/state_trackers/xa/xa_tracker.h.in @@ -38,7 +38,7 @@ #define XA_TRACKER_VERSION_MAJOR @XA_MAJOR@ #define XA_TRACKER_VERSION_MINOR @XA_MINOR@ -#define XA_TRACKER_VERSION_PATCH @XA_TINY@ +#define XA_TRACKER_VERSION_PATCH @XA_PATCH@ #define XA_FLAG_SHARED (1 << 0) #define XA_FLAG_RENDER_TARGET (1 << 1) diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index 9357d30332a..159c8ea3527 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -56,7 +56,7 @@ d3dadapter9_la_LDFLAGS = \ -shrext .so \ -module \ -no-undefined \ - -version-number $(NINE_MAJOR):$(NINE_MINOR):$(NINE_TINY) \ + -version-number $(NINE_MAJOR):$(NINE_MINOR):$(NINE_PATCH) \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 83a05230ff8..cd9ca49f568 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -44,7 +44,7 @@ libxatracker_la_LIBADD = \ libxatracker_la_LDFLAGS = \ -no-undefined \ - -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY) \ + -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_PATCH) \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) -- 2.30.2