diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-01 13:50:16 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-02 16:02:39 +0000 |
| commit | ee0dd367156bbc7eac6047e9a772782e56496f59 (patch) | |
| tree | ad80da4dde4acaef738f5b67dcdb7f1630793d52 /vcl | |
| parent | 5f985d3759f6d424426b04571da90cc02c717db1 (diff) | |
remove minor.mk
Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.
Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
Reviewed-on: https://gerrit.libreoffice.org/2491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 7 |
3 files changed, 2 insertions, 7 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index e0f9b0ac4187..3b8a6d21814b 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) ifeq ($(ENABLE_DBUS),TRUE) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index da60f73b5b75..7f29e762b8d4 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index ee7fb6e959d3..e1cb134fd5bd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -43,6 +43,7 @@ #include "atkutil.hxx" #include <gtk/gtk.h> +#include <config_version.h> #include <set> @@ -689,11 +690,7 @@ ooo_atk_util_get_toolkit_name (void) static G_CONST_RETURN gchar * ooo_atk_util_get_toolkit_version (void) { - /* - * Version is passed in as a -D flag when this file is - * compiled. - */ - return LIBO_VERSION; + return LIBO_VERSION_DOTTED; } /*****************************************************************************/ |