[gimp] app, tools: rename app/version.[ch] to app/gimp-version.[ch].
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app, tools: rename app/version.[ch] to app/gimp-version.[ch].
- Date: Mon, 29 Jan 2018 00:48:48 +0000 (UTC)
commit 1b4efd2d5a489d0eccdd323bb360e8a5c0824cba
Author: Jehan <jehan girinstud io>
Date: Mon Jan 29 00:58:01 2018 +0100
app, tools: rename app/version.[ch] to app/gimp-version.[ch].
Since commit 9fdf35550b, I removed the GIMP_APP_GLUE_COMPILATION check
because we need to have the whole versioning info from the new debug
widget. It just makes sense to go further and just make this a proper
internal API to get version information.
app/Makefile.am | 6 +++---
app/{version.c => gimp-version.c} | 2 +-
app/{version.h => gimp-version.h} | 1 -
app/main.c | 2 +-
app/widgets/gimpcriticaldialog.c | 3 +--
tools/Makefile.am | 4 ++--
6 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index a6738ce..803b53c 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -60,14 +60,14 @@ libapp_sources = \
tests.h \
unique.c \
unique.h \
- version.c \
- version.h \
gimp-debug.c \
gimp-debug.h \
+ gimp-intl.h \
gimp-log.c \
gimp-log.h \
gimp-priorities.h \
- gimp-intl.h
+ gimp-version.c \
+ gimp-version.h
libapp_generated_sources = \
git-version.h
diff --git a/app/version.c b/app/gimp-version.c
similarity index 99%
rename from app/version.c
rename to app/gimp-version.c
index 15bc0db..42e6355 100644
--- a/app/version.c
+++ b/app/gimp-version.c
@@ -32,10 +32,10 @@
#include "libgimpbase/gimpbase.h"
#include "about.h"
-#include "version.h"
#include "git-version.h"
#include "gimp-intl.h"
+#include "gimp-version.h"
static gchar *
diff --git a/app/version.h b/app/gimp-version.h
similarity index 99%
rename from app/version.h
rename to app/gimp-version.h
index 9f5f61a..0b52fdb 100644
--- a/app/version.h
+++ b/app/gimp-version.h
@@ -19,7 +19,6 @@
#define __VERSION_H__
-
void gimp_version_show (gboolean be_verbose);
gchar * gimp_version (gboolean be_verbose,
gboolean localized);
diff --git a/app/main.c b/app/main.c
index a25ef51..7c0bdac 100644
--- a/app/main.c
+++ b/app/main.c
@@ -63,7 +63,6 @@
#include "sanity.h"
#include "signals.h"
#include "unique.h"
-#include "version.h"
#ifdef G_OS_WIN32
/* To get PROCESS_DEP_* defined we need _WIN32_WINNT at 0x0601. We still
@@ -79,6 +78,7 @@
#include "gimp-log.h"
#include "gimp-intl.h"
+#include "gimp-version.h"
static gboolean gimp_option_fatal_warnings (const gchar *option_name,
diff --git a/app/widgets/gimpcriticaldialog.c b/app/widgets/gimpcriticaldialog.c
index 77e33c0..ee20107 100644
--- a/app/widgets/gimpcriticaldialog.c
+++ b/app/widgets/gimpcriticaldialog.c
@@ -42,9 +42,8 @@
#include "gimpcriticaldialog.h"
-#include "version.h"
-
#include "gimp-intl.h"
+#include "gimp-version.h"
typedef struct _GimpCriticalDialog GimpCriticalDialog;
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9f14a05..7abe5de 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,8 +33,8 @@ EXTRA_PROGRAMS = \
gimpdebug_2_0_SOURCES = gimpdebug.c \
../app/widgets/gimpcriticaldialog.h \
../app/widgets/gimpcriticaldialog.c \
- ../app/version.h \
- ../app/version.c
+ ../app/gimp-version.h \
+ ../app/gimp-version.c
gimpdebug_2_0_CPPFLAGS = \
-DCC_VERSION=\""$(CC_VERSION)"\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]