diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-08-15 13:57:42 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-08-15 13:57:42 +0000 |
| commit | 919178f1e952957fd5701874479d86df04baaa99 (patch) | |
| tree | 2dd729228f1d6b383871ea01d4e863ba06c97b6c | |
| parent | 3dc9607f8d080d7256c70d3b4452f47f8346d64a (diff) | |
| parent | d9c9e3b696a99f126e7d718a7eb7074cf38b5164 (diff) | |
Merge branch 'ebassi/build-fixes' into 'master'
build: Use subdir-objects
See merge request cairo/cairo!180
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/cairo-version.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 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 |