[cairo-commit] 3 commits - configure.ac src/cairo-version.h

[GitLab Mirror]

 configure.ac        |    2 +-
 src/cairo-version.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 919178f1e952957fd5701874479d86df04baaa99
Merge: 3dc9607f8 d9c9e3b69
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Aug 15 13:57:42 2021 +0000

    Merge branch 'ebassi/build-fixes' into 'master'
    
    build: Use subdir-objects
    
    See merge request cairo/cairo!180

commit d9c9e3b696a99f126e7d718a7eb7074cf38b5164
Author: Emmanuele Bassi <ebassi at gnome.org>
Date:   Tue May 11 15:47:13 2021 +0100

    Post-release version bump to 1.17.5
    
    This should have been done after releasing 1.17.4, but it did not
    happen.
    
    The micro version component in Cairo is always odd in Git, and even in
    releases.

diff --git a/src/cairo-version.h b/src/cairo-version.h
index 9fd69fb45..0eb1b7579 100644
--- a/src/cairo-version.h
+++ b/src/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 17
-#define CAIRO_VERSION_MICRO 4
+#define CAIRO_VERSION_MICRO 5
 
 #endif
commit 76c7f5edcf7977fba3f2a9e27b1ccb8d89cb588e
Author: Emmanuele Bassi <ebassi at gnome.org>
Date:   Tue May 11 15:34:19 2021 +0100

    build: Use subdir-objects
    
    We are referencing objects in sub-directories, which means we need to
    tell Automake about that.

diff --git a/configure.ac b/configure.ac
index c4373c3e6..0ca0c8e2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS(config.h)
 AC_CHECK_HEADERS([unistd.h sys/ioctl.h])
 AC_C_TYPEOF
 
-AM_INIT_AUTOMAKE([1.11 foreign -Wall no-define no-dist-gzip dist-xz serial-tests])
+AM_INIT_AUTOMAKE([1.11 foreign -Wall no-define no-dist-gzip dist-xz serial-tests subdir-objects])
 AM_SILENT_RULES([yes])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Workaround for Automake 1.12