diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-26 13:14:40 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-26 13:14:40 +0000 |
commit | 5d7fc828d1a7f1dc36ee3c75f841ba92d7f35b67 (patch) | |
tree | e836ef5951dae93c4145b857251fdbbd18b5d330 | |
parent | 88446e52f1bb5b20b1acd7b5901f31e0bebe24df (diff) |
remove version.cc (sigh)
git-svn-id: svn://localhost/ardour2/trunk@1020 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/SConscript | 4 | ||||
-rw-r--r-- | gtk2_ardour/about.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/version.cc | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 0b38e61c57..02ba7dd9c1 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -258,8 +258,6 @@ versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"' gtkardour.Append(CXXFLAGS=versionflag) -gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript') - executable = 'ardour.bin' ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources) @@ -307,6 +305,8 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files)) env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files)) +env.AlwaysBuild ('version.cc') +env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], ['..'])) #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 7bcd1d35b4..fcae1784a3 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -141,6 +141,9 @@ static const char* authors[] = { N_("Petter Sundlöf"), N_("Thörsten Wilms"), N_("Ben Loftis"), + N_("Stefan Kersten"), + N_("Christopher George"), + N_("Robert Jordens"), 0 }; @@ -187,15 +190,10 @@ About::About () set_name (X_("ardour")); set_website (X_("http://ardour.org/")); set_website_label (X_("visit http://www.ardour.org/")); - set_version ((string_compose(_("%1\n(built with ardour/gtk %2.%3.%4 libardour: %5.%6.%7)"), + set_version ((string_compose(_("%1\n(built from revision %s"), VERSIONSTRING, - gtk_ardour_major_version, - gtk_ardour_minor_version, - gtk_ardour_micro_version, - libardour_major_version, - libardour_minor_version, - libardour_micro_version))); - + gtk_ardour_revision))); + #ifdef WITH_PAYMENT_OPTIONS paypal_button.add (paypal_pixmap); diff --git a/gtk2_ardour/version.cc b/gtk2_ardour/version.cc deleted file mode 100644 index 825226de38..0000000000 --- a/gtk2_ardour/version.cc +++ /dev/null @@ -1 +0,0 @@ -const char* gtk_ardour_revision = "$Revision$"; |