From 3ac399bcc946ef5e398cdf7eaf603f7430ca1f28 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Fri, 11 Dec 2020 18:21:32 +0100 Subject: Change the ABI to glibmm-2.68 So we can use the 2.66 version numbers for stable releases in the glibmm-2.4 ABI series. We've done similar ABI name changes several times before. --- tools/Makefile.am | 8 ++++---- tools/test_scripts/testheaders.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 3ad3674c..2f37b02c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,16 +33,16 @@ dist_gmmproc_pm_DATA = $(files_codegen_pm:%=pm/%) 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.66.la +lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.68.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_66_la_SOURCES = extra_defs_gen/generate_extra_defs.cc -extra_defs_gen_libglibmm_generate_extra_defs_2_66_la_LDFLAGS = $(extradefs_ldflags) -extra_defs_gen_libglibmm_generate_extra_defs_2_66_la_LIBADD = $(GLIBMM_LIBS) +extra_defs_gen_libglibmm_generate_extra_defs_2_68_la_SOURCES = extra_defs_gen/generate_extra_defs.cc +extra_defs_gen_libglibmm_generate_extra_defs_2_68_la_LDFLAGS = $(extradefs_ldflags) +extra_defs_gen_libglibmm_generate_extra_defs_2_68_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 cc92fa2f..b5f54411 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 giomm-2.66 gio # compile glibmm/gio/giomm/*.h -# tools/test_scripts/testheaders.sh giomm-2.66 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h -# tools/test_scripts/testheaders.sh -I glib glibmm-2.66 glib/glibmm/ustring.h # compile glibmm/glib/glibmm/ustring.h +# tools/test_scripts/testheaders.sh -I glib giomm-2.68 gio # compile glibmm/gio/giomm/*.h +# tools/test_scripts/testheaders.sh giomm-2.68 glib gio # compile glibmm/glib/glibmm/*.h and glibmm/gio/giomm/*.h +# tools/test_scripts/testheaders.sh -I glib glibmm-2.68 glib/glibmm/ustring.h # compile glibmm/glib/glibmm/ustring.h # Usage: testheaders.sh [-I]... [ | ]... # -I is added to the g++ command. -- cgit v1.2.1