From 4038dda6cd84395cb033f0d01bb7b2ba4d09e19d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 14 May 2012 18:43:15 -0700 Subject: [PATCH] mesa: Move the version information right into configure.ac. Nothing else called version.mk. Reviewed-by: Kenneth Graunke --- bin/version.mk | 17 ----------------- configure.ac | 8 +------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100755 bin/version.mk diff --git a/bin/version.mk b/bin/version.mk deleted file mode 100755 index ab20d79daee..00000000000 --- a/bin/version.mk +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/make -sf -# Print the various Mesa version fields. This is mostly used to add the -# version to configure. - -# This reflects that this script is usually called from the toplevel -TOP = . - -include $(TOP)/configs/default - -version: - @echo $(MESA_VERSION) -major: - @echo $(MESA_MAJOR) -minor: - @echo $(MESA_MINOR) -tiny: - @echo $(MESA_TINY) diff --git a/configure.ac b/configure.ac index fb7c4a68417..ec4fa431fad 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,11 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -dnl Versioning - scrape the version from configs/default -m4_define([mesa_version], - [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])]) -m4_ifval(mesa_version,, - [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])]) - dnl Tell the user about autoconf.html in the --help output m4_divert_once([HELP_END], [ See docs/autoconf.html for more details on the options for Mesa.]) -AC_INIT([Mesa],[mesa_version], +AC_INIT([Mesa], [8.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa]) AC_CONFIG_AUX_DIR([bin]) AC_CANONICAL_HOST -- 2.30.2