callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: bump version to 2.9.1

Browse Source 
and change app/Makefile.am to use variables instead of hadcoding the
version.
This commit is contained in:
Michael Natterer
2012-05-02 17:43:43 +02:00
parent 5e9f1dd0ea
commit 950412fbdc
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Makefile.am
View File

@ -40,9 +40,9 @@ SUBDIRS = \
noinst_LIBRARIES = libapp.a noinst_LIBRARIES = libapp.a
if ENABLE_GIMP_CONSOLE if ENABLE_GIMP_CONSOLE
bin_PROGRAMS = gimp-2.8 gimp-console-2.8 bin_PROGRAMS = gimp-@GIMP_APP_VERSION@ gimp-console-@GIMP_APP_VERSION@
else else
bin_PROGRAMS = gimp-2.8 bin_PROGRAMS = gimp-@GIMP_APP_VERSION@
endif endif
libapp_sources = \ libapp_sources = \
@ -86,7 +86,7 @@ $(srcdir)/version.c: git-version.h
libapp_a_SOURCES = $(libapp_sources) $(libapp_generated_sources) libapp_a_SOURCES = $(libapp_sources) $(libapp_generated_sources)
gimp_2_8_SOURCES = $(libapp_sources) main.c gimp_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
if OS_WIN32 if OS_WIN32
@ -180,9 +180,9 @@ gimpconsoleldadd = \
$(INTLLIBS) \ $(INTLLIBS) \
$(RT_LIBS) $(RT_LIBS)
gimp_2_8_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags) gimp_@GIMP_APP_VERSION@_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags)
gimp_2_8_LDADD = \ gimp_@GIMP_APP_VERSION@_LDADD = \
gui/libappgui.a \ gui/libappgui.a \
menus/libappmenus.a \ menus/libappmenus.a \
actions/libappactions.a \ actions/libappactions.a \
@ -199,13 +199,13 @@ gimp_2_8_LDADD = \
if ENABLE_GIMP_CONSOLE if ENABLE_GIMP_CONSOLE
gimp_console_2_8_SOURCES = $(libapp_sources) main.c gimp_console_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
gimp_console_2_8_CPPFLAGS = \ gimp_console_@GIMP_APP_VERSION@_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-DGIMP_CONSOLE_COMPILATION -DGIMP_CONSOLE_COMPILATION
gimp_console_2_8_LDADD = \ gimp_console_@GIMP_APP_VERSION@_LDADD = \
$(gimpconsoleldadd) \ $(gimpconsoleldadd) \
$(GIMPCONSOLERC) $(GIMPCONSOLERC)

10
configure.ac
View File

@ -7,8 +7,8 @@ AC_PREREQ(2.54)
# GIMP_INTERFACE_AGE += 1; # GIMP_INTERFACE_AGE += 1;
m4_define([gimp_major_version], [2]) m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [8]) m4_define([gimp_minor_version], [9])
m4_define([gimp_micro_version], [0]) m4_define([gimp_micro_version], [1])
m4_define([gimp_real_version], m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version]) [gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version]) m4_define([gimp_version], [gimp_real_version])
@ -17,20 +17,20 @@ m4_define([gimp_binary_age],
[m4_eval(100 * gimp_minor_version + gimp_micro_version)]) [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
# For overriding the version string. Comment out if not needed. # For overriding the version string. Comment out if not needed.
# m4_define([gimp_version], [2.8.0]) # m4_define([gimp_version], [2.9.1])
# This is the X.Y used in -lgimp-X.Y # This is the X.Y used in -lgimp-X.Y
m4_define([gimp_api_version], [2.0]) m4_define([gimp_api_version], [2.0])
# Versions used for apps, plugins, tools, pkg-config files, and data, # Versions used for apps, plugins, tools, pkg-config files, and data,
# as well as global and user prefs # as well as global and user prefs
m4_define([gimp_app_version], [2.8]) m4_define([gimp_app_version], [2.9])
m4_define([gimp_plugin_version], [2.0]) m4_define([gimp_plugin_version], [2.0])
m4_define([gimp_tool_version], [2.0]) m4_define([gimp_tool_version], [2.0])
m4_define([gimp_pkgconfig_version], [2.0]) m4_define([gimp_pkgconfig_version], [2.0])
m4_define([gimp_data_version], [2.0]) m4_define([gimp_data_version], [2.0])
m4_define([gimp_sysconf_version], [2.0]) m4_define([gimp_sysconf_version], [2.0])
m4_define([gimp_user_version], [2.8]) m4_define([gimp_user_version], [2.9])
m4_define([gimp_unstable], m4_define([gimp_unstable],
m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no])) m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))