diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | docs/Makefile_web.am_fragment | 6 | ||||
-rw-r--r-- | glib/glibmm.h | 4 | ||||
-rw-r--r-- | tools/Makefile.am | 8 | ||||
-rwxr-xr-x | tools/test_scripts/testheaders.sh | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 766b5426..8ac22303 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU Lesser General Public License ## along with this library. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([glibmm], [2.55.2], +AC_INIT([glibmm], [2.57.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm], [glibmm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) @@ -31,8 +31,8 @@ AM_MAINTAINER_MODE AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>]) MM_PREREQ([0.9.10]) -MM_INIT_MODULE([glibmm-2.56]) -MM_INIT_MODULE([giomm-2.56]) +MM_INIT_MODULE([glibmm-2.58]) +MM_INIT_MODULE([giomm-2.58]) # Copy the mm-common .pl scripts into docs/, # and use them from there, diff --git a/docs/Makefile_web.am_fragment b/docs/Makefile_web.am_fragment index dd59ab94..eb4f416b 100644 --- a/docs/Makefile_web.am_fragment +++ b/docs/Makefile_web.am_fragment @@ -1,8 +1,8 @@ web_host = gtkmm.org -web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.56/ -#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.56/ +web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.58/ +#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.58/ web_path_docs = $(web_path_gtkmm)docs/ rsync_args = -vz --rsh ssh -gtkmm_docdir = $(datadir)/doc/glibmm-2.56/docs +gtkmm_docdir = $(datadir)/doc/glibmm-2.58/docs diff --git a/glib/glibmm.h b/glib/glibmm.h index 44f2ea54..c4d18a24 100644 --- a/glib/glibmm.h +++ b/glib/glibmm.h @@ -64,12 +64,12 @@ * * If your source file is @c program.cc, you can compile it with: * @code - * g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.56 giomm-2.56` + * g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.58 giomm-2.58` * @endcode * * Alternatively, if using autoconf, use the following in @c configure.ac: * @code - * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.56 giomm-2.56]) + * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.58 giomm-2.58]) * @endcode * Then use the generated @c GLIBMM_CFLAGS and @c GLIBMM_LIBS variables in the * project Makefile.am files. For example: 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. |