[beast: 9/11] BUILD: remove BST_VERSION_HINT

[Tim Janik <timj src gnome org>]

commit abd91edf7cba10bf7e754ddbf0e576f10aa40fca
Author: Tim Janik <timj gnu org>
Date:   Wed Nov 2 23:05:21 2016 +0100

    BUILD: remove BST_VERSION_HINT
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstmain.cc |    6 +++---
 configure.ac         |    2 --
 shell/bsescm.cc      |    2 +-
 tools/Makefile.am    |    2 +-
 tools/bsewavetool.cc |    3 ++-
 5 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 7897c28..7e075f5 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -214,8 +214,8 @@ main_init_gxk()
   bst_splash_set_text (beast_splash,
                       Rapicorn::string_format ("<b><big>BEAST</big></b>\n"
                                                 "<b>The BSE Equipped Audio Synthesizer and Tracker</b>\n"
-                                                "<b>Version %s (%s)</b>\n",
-                                                Internal::buildid(), BST_VERSION_HINT));
+                                                "<b>Version %s</b>\n",
+                                                Internal::buildid()));
   bst_splash_update_entity (beast_splash, _("Startup"));
   bst_splash_show_grab (beast_splash);
 }
@@ -867,7 +867,7 @@ bst_exit_print_version (void)
   assert (bse_server != NULL); // we need BSE
   String s;
   gchar *freeme = NULL;
-  printout ("BEAST version %s (%s)\n", Internal::buildid(), BST_VERSION_HINT);
+  printout ("BEAST version %s\n", Internal::buildid());
   printout ("Libraries: ");
   printout ("GLib %u.%u.%u", glib_major_version, glib_minor_version, glib_micro_version);
   printout (", BSE %s", Bse::version());
diff --git a/configure.ac b/configure.ac
index 1d6f3a0..7184c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ AC_PREREQ(2.57)
 # * ~RC:             Release candidate, may contain [~-]\w+[0-9]+ or nothing
 AC_INIT([beast], [0.10.1~wip])
 :;   ABI_VERSION=[0.10.0]
-BST_VERSION_HINT=alpha
 AC_CONFIG_SRCDIR([bse/bseserver.cc])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
@@ -31,7 +30,6 @@ BST_VERSION="$PACKAGE_VERSION"
 AC_SUBST(BEAST_VERSION)
 AC_DEFINE_UNQUOTED(BST_ARCH_NAME, "$target", [Architecture Description])
 AC_DEFINE_UNQUOTED(BST_VERSION, "$BST_VERSION", [Beast Version])
-AC_DEFINE_UNQUOTED(BST_VERSION_HINT, "$BST_VERSION_HINT", [Version classification])
 AC_DEFINE_UNQUOTED(BSE_MAJOR_VERSION, $MAJOR, [Beast/Bse Major Version])
 AC_DEFINE_UNQUOTED(BSE_MINOR_VERSION, $MINOR, [Beast/Bse Minor Version])
 AC_DEFINE_UNQUOTED(BSE_MICRO_VERSION, $MICRO, [Beast/Bse Micro Version])
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index 9dd9543..21c2c05 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -265,7 +265,7 @@ shell_parse_args (int *argc_p, char **argv)
       else if (strcmp ("-v", argv[i]) == 0 ||
                strcmp ("--version", argv[i]) == 0)
         {
-          printout ("BSESCM version %s (%s)\n", BST_VERSION, BST_VERSION_HINT);
+          printout ("BSESCM version %s\n", BST_VERSION);
           printout ("Libraries: ");
           printout ("GLib %u.%u.%u", glib_major_version, glib_minor_version, glib_micro_version);
           printout (", SFI %s", BST_VERSION);
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3a151c9..a25c502 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@ progs_ldadd     = ../bse/libbse-@MAJOR@.la $(LIBBSE_LIBS)
 #
 
 bin_PROGRAMS        = bsewavetool
-bsewavetool_SOURCES = bsewavetool.cc bwtwave.cc bseloopfuncs.cc
+bsewavetool_SOURCES = bsewavetool.cc bwtwave.cc bseloopfuncs.cc ../topbuildid.cc
 bsewavetool_LDADD   = $(progs_ldadd)
 EXTRA_DIST         += bsewavetool.hh bwtwave.hh bseloopfuncs.hh sfiutils.hh
 
diff --git a/tools/bsewavetool.cc b/tools/bsewavetool.cc
index a8f6ea3..3a38a68 100644
--- a/tools/bsewavetool.cc
+++ b/tools/bsewavetool.cc
@@ -2,6 +2,7 @@
 #include "bsewavetool.hh"
 #include "bwtwave.hh"
 #include "../configure.h"
+#include "../topbuildid.hh"
 #include <bse/bsemain.hh>      /* for bse_init_intern() */
 #include <bse/bseloader.hh>
 #include <bse/gslvorbis-enc.hh>
@@ -198,7 +199,7 @@ main (int   argc,
 static void
 wavetool_print_version (void)
 {
-  printout ("bsewavetool version %s (%s)\n", BST_VERSION, BST_VERSION_HINT);
+  printout ("bsewavetool version %s\n", Internal::buildid());
   printout ("Refer to beast --version for more version information.\n");
   printout ("bsewavetool comes with ABSOLUTELY NO WARRANTY.\n");
   printout ("You may redistribute copies of bsewavetool under the terms\n");