summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2018-03-26 11:14:15 +0200
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2018-03-26 11:14:15 +0200
commit2c36f67523b4c47f8d0a2384850f0f62a4a53386 (patch)
tree396a8f34f3f8f75258fff55d0ac605799f81a30e /tools
parented8ae73179bca4dd13991cf2e0db34238013321d (diff)
downloadglibmm-2c36f67523b4c47f8d0a2384850f0f62a4a53386.tar.gz
Change the ABI to glibmm-2.58
So we can use the 2.55/56 version numbers for more stable releases. We don't need to release a stable ABI-parallel glibmm until we need to release gtkmm 4.0, and that won't happen until GTK+ 4.0.0 happens, and we don't know when that might be. We did this twice before: https://git.gnome.org/browse/glibmm/commit/?id=dee483b29bdaaabc587f3f8b6bff05663e7dccdc https://git.gnome.org/browse/glibmm/commit/?id=9f89221b024b028286bea35f7a4d9b873bfb3266
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am8
-rwxr-xr-xtools/test_scripts/testheaders.sh6
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b583e1d5..cd517a85 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,16 +34,16 @@ dist_noinst_DATA = README TODO
dist_noinst_SCRIPTS = enum.pl
noinst_PROGRAMS = extra_defs_gen/generate_defs_glib extra_defs_gen/generate_defs_gio
-lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.56.la
+lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.58.la
extradefs_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)/glibmm_generate_extra_defs
extradefs_include_HEADERS = extra_defs_gen/generate_extra_defs.h
extradefs_ldflags = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
-extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
-extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_LDFLAGS = $(extradefs_ldflags)
-extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_LIBADD = $(GLIBMM_LIBS)
+extra_defs_gen_libglibmm_generate_extra_defs_2_58_la_SOURCES = extra_defs_gen/generate_extra_defs.cc
+extra_defs_gen_libglibmm_generate_extra_defs_2_58_la_LDFLAGS = $(extradefs_ldflags)
+extra_defs_gen_libglibmm_generate_extra_defs_2_58_la_LIBADD = $(GLIBMM_LIBS)
extra_defs_gen_generate_defs_glib_SOURCES = extra_defs_gen/generate_defs_glib.cc
extra_defs_gen_generate_defs_glib_LDADD = $(GLIBMM_LIBS) $(lib_LTLIBRARIES)
diff --git a/tools/test_scripts/testheaders.sh b/tools/test_scripts/testheaders.sh
index 3d8477d4..5780d7fd 100755
--- a/tools/test_scripts/testheaders.sh
+++ b/tools/test_scripts/testheaders.sh
@@ -5,9 +5,9 @@
# files that it depends on.
# Example: In glibmm, go to directory glibmm, and run
-# tools/test_scripts/testheaders.sh -I glib glibmm-2.54 gio # compile glibmm/gio/giomm/*.h
-# tools/test_scripts/testheaders.sh glibmm-2.54 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h
-# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.54 glib/glibmm/ustring.h # compile glibmm/glib/glibmm/ustring.h
+# tools/test_scripts/testheaders.sh -I glib glibmm-2.58 gio # compile glibmm/gio/giomm/*.h
+# tools/test_scripts/testheaders.sh glibmm-2.58 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h
+# tools/test_scripts/testheaders.sh -I glib -I gio glibmm-2.58 glib/glibmm/ustring.h # compile glibmm/glib/glibmm/ustring.h
# Usage: testheaders.sh [-I<dir>]... <pkg> [<dir> | <file>]...
# -I<dir> is added to the g++ command.